| commit | fd40dd977d785aafbe781c918dc94dedbc59eacd | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 20:56:09 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 20:56:09 2013 +0000 |
| tree | 2fc055ffbac9cb21c6a56da63126caccbca58b5d | |
| parent | d7b4af9b560fb11ca0acb78ca937a0eeb06e147c [diff] | |
| parent | 998a1748b68838ee2b1465c9e53de65453b0a047 [diff] |
am 998a1748: (-s ours) am c3f789fd: am 7b52eac4: am 99a7231d: am 9708aa4e: (-s ours) am 12bc4c4b: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '998a1748b68838ee2b1465c9e53de65453b0a047':