| commit | bf2920e3ab5bed17685101b58e9e66a4dcc59a7e | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Oct 09 07:29:52 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 09 07:29:52 2012 -0700 |
| tree | 60acfb161b358e1be3662f8721e4f19fff0bc984 | |
| parent | b8a4f1eaa83c13cbff27ff186823a45122c66b01 [diff] | |
| parent | 8cbb869a0724a2522cf25712950da70459acb673 [diff] |
am 8cbb869a: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '8cbb869a0724a2522cf25712950da70459acb673':