| commit | 08f5b7802a8e38bf17b4996460946e140b175e3b | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Mar 29 09:58:07 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 29 09:58:07 2013 -0700 |
| tree | 71b5d2b21f5bd07dd85de168f5d8c097b44f098d | |
| parent | 70747ad6c34851be522fc25247271a098b72034c [diff] | |
| parent | c1dec87a76565c5dfa223c7d4d5f10a345ab3799 [diff] |
am c1dec87a: (-s ours) am b35915fb: (-s ours) Reconcile with jb-mr2-release - do not merge * commit 'c1dec87a76565c5dfa223c7d4d5f10a345ab3799':