commit | 23dd801d5db0d8a5e5e5dd3266708e6167195c9f | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Jan 12 09:00:23 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 12 09:00:23 2012 -0800 |
tree | 7023d3161aac0efb77b3802dc89a636a88130eee | |
parent | 75987dbe0ca7609bf4f11f2d7edfe4bcd70a4fe5 [diff] | |
parent | 861de21e614df941810bb1e233e2ddc420884df3 [diff] |
am 861de21e: Reconcile with ics-mr1-release * commit '861de21e614df941810bb1e233e2ddc420884df3':