| commit | 7c92558beb2d8d3ef2d268a849ca84e467bf9d4f | [log] [tgz] |
|---|---|---|
| author | Danielle Millett <dmillett@google.com> | Thu Jan 12 07:31:37 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 12 07:31:37 2012 -0800 |
| tree | 485b152b97bf8321fdd223f35587bb4294672be8 | |
| parent | 4396642bd5666b7f9e21499caeb321ca1ea3079f [diff] | |
| parent | 178c4fbfe262c2af0301084f8b494828cd772cc5 [diff] |
am 2931d8ac: Merge "DO NOT MERGE - Cherry picking from master to MR1" into ics-mr1 * commit '2931d8ace9118bafe08090cd41e235048b6c2eb2': DO NOT MERGE - Cherry picking from master to MR1