| commit | fee1840f3d6d68c5f3d4e4ab9372305e154c64a9 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 08 14:22:21 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 08 14:22:21 2012 -0800 |
| tree | 3d1b5a4445ff5d8769e2572f14ad3264cf696b17 | |
| parent | 8bb938dcc9a7d1c9f465439121171793fb405d14 [diff] | |
| parent | 15d91c6e825d6529cf03478410c3ff92d8879b53 [diff] |
am 15d91c6e: Reconcile with jb-mr1-release - do not merge * commit '15d91c6e825d6529cf03478410c3ff92d8879b53':