| commit | a038e71dcb422a75d8a8da74a15d31e7cf64219a | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Oct 11 08:08:17 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 11 08:08:17 2012 -0700 |
| tree | 9cd528aeb893f4fa1505d5cfa4863ce936a160e2 | |
| parent | ac2e710afe3f1a5059710135da8c5a256fa41024 [diff] | |
| parent | c476f09d4a8c37c16e352cbcf3745e1b33ede7fb [diff] |
am c476f09d: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'c476f09d4a8c37c16e352cbcf3745e1b33ede7fb':