commit | 16d5e196dc12254670ff43f622234c892db547e4 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Jan 12 09:00:24 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 12 09:00:24 2012 -0800 |
tree | f6236e3c6040f91d381738db515d1a1bb0df422f | |
parent | 21814c56f0859a2d83d1ecc29f4a74210c4497a1 [diff] | |
parent | 201a8ba8531191b133ef4549b9cf0a61818a02d2 [diff] |
am 201a8ba8: Reconcile with ics-mr1-release * commit '201a8ba8531191b133ef4549b9cf0a61818a02d2':