| commit | 2bc271b04f19c9c9a1bffcf0e843bae650d3b8bc | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Sep 20 12:48:53 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 20 12:48:53 2012 -0700 |
| tree | 6871ab5f9e468a37e0a685455abf46a48b09d73a | |
| parent | bf1ed30dac4f7d63393b9d137d3edfd4957d5fe3 [diff] | |
| parent | 1389bc2759c5639b39fe63b9c997009c6c8be9e2 [diff] |
am 1389bc27: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '1389bc2759c5639b39fe63b9c997009c6c8be9e2':