| commit | 4d8032b5e67e0a6a8929caaa1460716cd90dd04b | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Mar 05 13:13:33 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 05 13:13:33 2013 -0800 |
| tree | 9a2d592da5d36df948e557bb357922aa690e42df | |
| parent | da2a4a5048a5aa8327bfdc768ed81561b13a5ef2 [diff] | |
| parent | f3b63ed11a5a7e9b19bcfe8b42f9cd9c029e6a14 [diff] |
am f3b63ed1: am 67128cbc: (-s ours) am 18cd9793: (-s ours) am 84d3036c: (-s ours) am ed9cc555: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'f3b63ed11a5a7e9b19bcfe8b42f9cd9c029e6a14':