| commit | 5e3af9312a94e91dd8f0e9c9b40d4d959bb6484d | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Aug 15 08:32:35 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 15 08:32:35 2012 -0700 |
| tree | 7d48ece10ed4da5323ccaf861d1923cc0a30a335 | |
| parent | 6de9974673f0fbf348dc914ccc9afe442ec7299f [diff] | |
| parent | 4d63fa1e119b8979621cc8ead955c8f8e2c78b0a [diff] |
am 4d63fa1e: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '4d63fa1e119b8979621cc8ead955c8f8e2c78b0a':