| commit | 74efb2c2aa3475d937f631eb8d81aa21e197c049 | [log] [tgz] |
|---|---|---|
| author | David 'Digit' Turner <digit@google.com> | Tue Jun 17 18:52:54 2014 +0200 |
| committer | David 'Digit' Turner <digit@google.com> | Tue Jun 17 18:52:54 2014 +0200 |
| tree | dea934d3e5cc11608cc1a8c4e8d351f4137de99f | |
| parent | 8f6c3b4fb3e93db76c3c209d204d8bec918924e0 [diff] | |
| parent | c5f5903cbd73cdd86d10f0256442e2b426ac5596 [diff] |
resolve merge conflicts of c5f5903 to master. Conflicts: android/main-emulator.c Change-Id: Iffc6f5aaa95a1cdfcc81a26c43172e6c5ba8111a