commit | 9185a6c2c315a8db537edc5d1bf582199d157bb2 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 08 06:27:09 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 08 06:27:09 2012 -0800 |
tree | 45c069fafd577f82b554478ad9a3d49204020aff | |
parent | 4eef51016adc4e103fa65d944a0ab31527ddced8 [diff] | |
parent | a8ec322b1a24111aa3e7e533d00586536212ff7b [diff] |
am a8ec322b: am bc43e3f2: Reconcile with jb-mr1-release - do not merge * commit 'a8ec322b1a24111aa3e7e533d00586536212ff7b':