commit | a738ebf45806c9e4c9b85af87c4590f96e7ee9f3 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Feb 23 07:29:03 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 23 07:29:03 2012 -0800 |
tree | 8013ce3d7761691376820149d18aa778e11f15d8 | |
parent | 860d73c398a1452f57cd3ccdacfff198a51c88d9 [diff] | |
parent | 1800a2f2d816a9c0b58f6ebb468e76d9d1911c8e [diff] |
am 1800a2f2: am 790c9ce6: Reconcile with ics-mr1-release * commit '1800a2f2d816a9c0b58f6ebb468e76d9d1911c8e':