commit | 0f733c5114aa4f01a02cac72f3b13d40056ffdaa | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Jan 20 15:52:27 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jan 20 15:52:27 2012 -0800 |
tree | 72f355ad7e7ef180adef3dfe2af9774f74a3ca11 | |
parent | aca431c709ae2cf2be61954b78239e39ec875411 [diff] | |
parent | 874e55fd7c11e3a53887a732ebc5d756118b7475 [diff] |
am 5d0c713a: Reconcile with ics-mr1-release * commit '5d0c713a87e9fd3cc7a775092aef9fc1194c7440':