| commit | b4cf28d1d6da4d18d43791ff68364d81867c4a44 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Sep 20 12:46:05 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 20 12:46:05 2012 -0700 |
| tree | 11bb4dc019f4d6064666403df2023d8d8fe6e272 | |
| parent | 7f273a8f46df0f4a576a25f53ba10d2daf6ccfea [diff] | |
| parent | 2b479c79a60c142eb0dd112572d96f496bdcc93b [diff] |
am 2b479c79: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '2b479c79a60c142eb0dd112572d96f496bdcc93b':