commit | 26cc4ddd0d0cb40a45918b30fb057e9d224f581d | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Mar 01 10:14:19 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 01 10:14:19 2012 -0800 |
tree | 340be41f4e2e2f515a28e1d564164a5c163d8eaa | |
parent | c11eaf3c25f912bfd7318c89011d990bf40cc06e [diff] | |
parent | 8534a2a77e2a28918c0777508514b1279c3a24e5 [diff] |
am 8534a2a7: Reconcile with ics-mr1-release * commit '8534a2a77e2a28918c0777508514b1279c3a24e5':