| commit | adf3d1bd694f69bd92850a906a5beb870eab1394 | [log] [tgz] |
|---|---|---|
| author | David 'Digit' Turner <digit@google.com> | Wed Jun 25 20:47:34 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 25 20:47:34 2014 +0000 |
| tree | fe7b38873f1730d6b100e99465e85df91d7d8542 | |
| parent | 575a7f10d9584615fe6b59d42b9d580fbfef6091 [diff] | |
| parent | 9e0c287090214bb944023da7cb0680aec3a39d16 [diff] |
am 9e0c2870: update: Parse ramdisk.img to detect partition formats. * commit '9e0c287090214bb944023da7cb0680aec3a39d16': update: Parse ramdisk.img to detect partition formats.
diff --git a/README b/README index 2af2f9f..342cd69 100644 --- a/README +++ b/README
@@ -11,6 +11,6 @@ Below is the list of specific commits for each input directory used: external/gtest e8981d1 Add LOCAL_MULTILIB := both for host targets. -external/qemu fb8aca0 Fix emulation of old platform images. +external/qemu 965a6e0 Parse fstab.goldfish file from ramdisk.img sdk/emulator/opengl 1af0da2 Merge "emulator/opengl: Prepare for 64-bit build changes." into idea133 automerge: 343a78f
diff --git a/darwin-x86_64/emulator64-arm b/darwin-x86_64/emulator64-arm index 58de403..ccb29be 100755 --- a/darwin-x86_64/emulator64-arm +++ b/darwin-x86_64/emulator64-arm Binary files differ
diff --git a/darwin-x86_64/emulator64-mips b/darwin-x86_64/emulator64-mips index d423501..3b98384 100755 --- a/darwin-x86_64/emulator64-mips +++ b/darwin-x86_64/emulator64-mips Binary files differ
diff --git a/darwin-x86_64/emulator64-x86 b/darwin-x86_64/emulator64-x86 index 3c3f513..b38eadc 100755 --- a/darwin-x86_64/emulator64-x86 +++ b/darwin-x86_64/emulator64-x86 Binary files differ
diff --git a/linux-x86_64/emulator64-arm b/linux-x86_64/emulator64-arm index 9bbd606..271e9c5 100755 --- a/linux-x86_64/emulator64-arm +++ b/linux-x86_64/emulator64-arm Binary files differ
diff --git a/linux-x86_64/emulator64-mips b/linux-x86_64/emulator64-mips index d657714..4cb2713 100755 --- a/linux-x86_64/emulator64-mips +++ b/linux-x86_64/emulator64-mips Binary files differ
diff --git a/linux-x86_64/emulator64-x86 b/linux-x86_64/emulator64-x86 index 5572202..c9e3d73 100755 --- a/linux-x86_64/emulator64-x86 +++ b/linux-x86_64/emulator64-x86 Binary files differ