| commit | 7786467725c0fea4aa3aa823849ec95acb3de202 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Oct 04 07:52:34 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 04 07:52:34 2012 -0700 |
| tree | 7d7f0dd8bcd09b9e7dce78cbe19b65a957d527ff | |
| parent | 656a24cae7c49e7bbbc1ad5e8f4cdfcc7f65f6e7 [diff] | |
| parent | b78ced24c6da9d80a4d94017bdf8493dcb3f1f4b [diff] |
am b78ced24: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'b78ced24c6da9d80a4d94017bdf8493dcb3f1f4b':