| commit | 81c5c8b8864d32adc74a56482125b46ed083d155 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Nov 12 07:34:08 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 12 07:34:08 2012 -0800 |
| tree | f76bace44e9431782f94c70d579786f6b08d5796 | |
| parent | a6e95f450334c60855d3bcf9cf2282260ab5ec6b [diff] | |
| parent | bc4bcf4ad0d4be53235e949098b7cbd45b30b8c8 [diff] |
am bc4bcf4a: (-s ours) am daa3e04e: am 2e939805: Reconcile with jb-mr1-release - do not merge * commit 'bc4bcf4ad0d4be53235e949098b7cbd45b30b8c8': JOP40C JOP40B