| tag | 881a266649fa9d50143c57232b2d2a2a09bf29a3 | |
|---|---|---|
| tagger | The Android Open Source Project <initial-contribution@android.com> | Fri Dec 02 13:00:23 2011 -0800 |
| object | cf209523884350a3ad6af5840f1b0ae2dde9b98b |
Android 4.0.1 release 1.2
| commit | cf209523884350a3ad6af5840f1b0ae2dde9b98b | [log] [tgz] |
|---|---|---|
| author | David 'Digit' Turner <digit@google.com> | Tue Sep 27 12:36:16 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 27 12:36:16 2011 -0700 |
| tree | ddb15a20cfba9412d8bfd27aac5bcf0c08cd45d2 | |
| parent | cc3f6a345b0cc356b22f9ea748505ce8a705d358 [diff] | |
| parent | 7bd7dd5d49e21c66c83618cb9f85ef43af29e441 [diff] |
am 7bd7dd5d: am 3c935eda: resolved conflicts for merge of 33fddf0c to gingerbread-plus-aosp * commit '7bd7dd5d49e21c66c83618cb9f85ef43af29e441': emulator: Add <hardware/qemu_pipe.h> header