| commit | 382a50ccd74e7c57cba490c650ce2763695b7a1a | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 13:06:42 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 13:06:42 2013 -0700 |
| tree | fd17cc0732df4dbc709c4682f6977e4dc6502308 | |
| parent | 79d9c5de43562878f8cf102a5c6a82cbf6014e83 [diff] | |
| parent | 6384a9f810a154ea8f77a5ee97effb7be80943d2 [diff] |
am 336ce2a5: am 63e89c49: am 17f9bee4: (-s ours) am 58af0551: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '336ce2a52156558d62a894d0320d91d1f22b0c52':