| commit | 5bc5cfcefad722ebfdd44ef4483289138f68a808 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 08 06:17:37 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 08 06:17:37 2012 -0800 |
| tree | 06cf00d20f545c91079674ca3290e0a4fa605f94 | |
| parent | 334423b749dc8e9d0cbf8a254ebcfebf7043b315 [diff] | |
| parent | 103a052e340b409ff6ccecadaee8cc3fdc62dcf0 [diff] |
am 103a052e: (-s ours) am 43b91298: am 34d12aaf: Reconcile with jb-mr1-release - do not merge * commit '103a052e340b409ff6ccecadaee8cc3fdc62dcf0': JOP37