| commit | 336ce2a52156558d62a894d0320d91d1f22b0c52 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 13:00:25 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 13:00:25 2013 -0700 |
| tree | 0897f3403e18edc2efa3bb26ca19b551aa33effe | |
| parent | a4d5b7503e29fa54615b916835790f5f18d25bee [diff] | |
| parent | 63e89c4987503a86a7a771e4b27b966e40c546e8 [diff] |
am 63e89c49: am 17f9bee4: (-s ours) am 58af0551: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '63e89c4987503a86a7a771e4b27b966e40c546e8':