| commit | f3b63ed11a5a7e9b19bcfe8b42f9cd9c029e6a14 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Mar 05 13:09:32 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 05 13:09:32 2013 -0800 |
| tree | 5a21823c0312082613eee65a92cf99b2e7e8da30 | |
| parent | ec29e793addbad4a2b80e2af63ef031cda1d1076 [diff] | |
| parent | 67128cbc3371586b6ae0b428621c8d95fb9561f0 [diff] |
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 '67128cbc3371586b6ae0b428621c8d95fb9561f0':