commit | e5f6b61e77e2fccb3c5c14ca8d57a32959339cd0 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Feb 23 11:20:08 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 23 11:20:08 2012 -0800 |
tree | 1f1d3f4862b80780fdd3c0b1fce2562f4834bbd0 | |
parent | a11e7ea646b8e67bcfe913b746c653515beb4e8a [diff] | |
parent | 13ac4aef6bfae49fd9087c2f862a854b8349e6ee [diff] |
am 13ac4aef: am b6893f46: Reconcile with ics-mr1-release * commit '13ac4aef6bfae49fd9087c2f862a854b8349e6ee':