| commit | b4f5a32e497162db5b0ab83b5a193c95569044a2 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Dec 19 14:35:35 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 19 14:35:35 2012 -0800 |
| tree | 73a4607c92d00c87f9c6e059957e8180046afc68 | |
| parent | 536a7b24a36033de9b4a8331317ce120d988978f [diff] | |
| parent | e57594a6934a912ab7b1bd0b8bdaff187ae25ca3 [diff] |
am e57594a6: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit 'e57594a6934a912ab7b1bd0b8bdaff187ae25ca3': JDP80B