commit | d7a9ff6ddc2895d298598e53cf7b967742e0d4da | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Mar 21 08:26:54 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 21 08:26:54 2012 -0700 |
tree | 147093a73e7177b761c04c70fa999e44e607a5dc | |
parent | e1176866629c90bc1403926186bf2b7efc736a2a [diff] | |
parent | 176545930d60a366734bbf70c3b60332a606c01e [diff] |
am 17654593: Reconcile with ics-mr1-release * commit '176545930d60a366734bbf70c3b60332a606c01e':