commit | 5aa16e9f24e06d5fb1e8f718ea1c812cf1ae32a7 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Dec 21 07:25:45 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 21 07:25:45 2011 -0800 |
tree | 8e8d3d9b3e52810008e1913db19e678beef44fc5 | |
parent | 5c571b4e5f2802a5d46730fb818a0c471f67cdab [diff] | |
parent | dfed08bcfd3ff738cb3a14b261eff2f1b50d4e04 [diff] |
am dfed08bc: am 7e4aa24c: Reconcile with ics-mr1-release * commit 'dfed08bcfd3ff738cb3a14b261eff2f1b50d4e04':