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