| commit | cf27115ae132c6870b449ea36164ed10c606109a | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 08 06:29:54 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 08 06:29:54 2012 -0800 |
| tree | b101c07bdd6807e02d56231a8f4d65dea9cccc3a | |
| parent | 4d691a37d3706d8ed3a0759adbbeeeb50ab6542e [diff] | |
| parent | f4488d0312bd5a1af03b8c353bfe0c1f0e836f33 [diff] |
am f4488d03: (-s ours) am a4d8f804: am a8540f2a: Reconcile with jb-mr1-release - do not merge * commit 'f4488d0312bd5a1af03b8c353bfe0c1f0e836f33':