| commit | ed6b57fcff8e3204bbd1a2333c13ee560dd287ee | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Dec 14 16:48:50 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 14 16:48:50 2012 -0800 |
| tree | 7d12c351979cc37a1735c95633b9557a70ae66fc | |
| parent | 3a1dea0b95be22743aa3b8a9abe3e7d9dcda2b23 [diff] | |
| parent | 17a890729e430503c7a906073dbde570da34c377 [diff] |
am 17a89072: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit '17a890729e430503c7a906073dbde570da34c377':