commit | a8ec322b1a24111aa3e7e533d00586536212ff7b | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Nov 07 10:24:23 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 07 10:24:23 2012 -0800 |
tree | d47d1f3479b12d440cbe257838b8b3be638685b3 | |
parent | aa5d6fe05ce45e36b732a3abc849508cd8279257 [diff] | |
parent | bc43e3f29060252d2a08b4e976bdb2ca50438623 [diff] |
am bc43e3f2: Reconcile with jb-mr1-release - do not merge * commit 'bc43e3f29060252d2a08b4e976bdb2ca50438623':