| commit | b3758ba79191a40ece0e563008f96145286fc167 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 12:25:42 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 06 12:25:42 2012 -0800 |
| tree | e6e4939d89a60fb561f0c8bbaed0eeb662d17cef | |
| parent | 9f34d162c7eb64835f5e1431063afdbe491b8c75 [diff] | |
| parent | b2a7de12dfc0d623ca45199c7362c68070fb21eb [diff] |
am b2a7de12: (-s ours) am 688b235b: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit 'b2a7de12dfc0d623ca45199c7362c68070fb21eb':