| commit | 5c0da20cbe442794d68106c3c5ee8cd88fee9291 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 08 14:22:27 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 08 14:22:27 2012 -0800 |
| tree | 44f8d4b3884c9c75959ac2a93892e5452c476219 | |
| parent | 72325cdb65a321df7755ba214efd9be42ce828d5 [diff] | |
| parent | 71a408b9c5f2c071df8cd26f5c8c991cb50bbd96 [diff] |
am 71a408b9: Reconcile with jb-mr1-release - do not merge * commit '71a408b9c5f2c071df8cd26f5c8c991cb50bbd96':