| commit | 593113ce6345257b741b9b7d2255f10f46b7ab9d | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Sep 24 10:13:01 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 24 10:13:01 2012 -0700 |
| tree | 1a75fa5ebb90fb377c0544903e2ceca7712a9806 | |
| parent | 0b7d66243d80e4d75e886e6018624da4004f7302 [diff] | |
| parent | 637cea3dadf57c2388a171a9965f58d66ed3840e [diff] |
am 637cea3d: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '637cea3dadf57c2388a171a9965f58d66ed3840e':