| commit | 23f8753a9fa34058a76ed0d12a6fccc861cb87a4 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Sep 20 12:46:04 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 20 12:46:04 2012 -0700 |
| tree | b8d61f9d1797ea60b94609cbb758e2ff0c16b467 | |
| parent | 8d87a9e8232df01f06ff56b9d2c81ab932faa18e [diff] | |
| parent | bc07696f4ca3b2cdbeddf4b00ace9eaea9b98217 [diff] |
am bc07696f: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'bc07696f4ca3b2cdbeddf4b00ace9eaea9b98217':