| commit | e85cae6b536dd52b916c9f2f322c9a81c83c27ea | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Feb 16 11:25:22 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 16 11:25:22 2012 -0800 |
| tree | 648c41db7bc49430e839d20b481904e507eb400d | |
| parent | 262e91d50a61da990e0a1e0c35bdb8b0c1dd98c7 [diff] | |
| parent | 75c77d92e8e4f25a960340a1562aab4e4fe4b822 [diff] |
am 75c77d92: am e93b5221: Reconcile with ics-mr1-release * commit '75c77d92e8e4f25a960340a1562aab4e4fe4b822':