| commit | 7259dfe62f35e663ca99a52f4c0596a6ec3a6a44 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 13:00:56 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 13:00:56 2013 -0700 |
| tree | b012d7678c9ba215c95a9c3b7b116efa3cc8d13f | |
| parent | 92c5ddcbe6d79fb8609b6b13eb56b4c5da43f07d [diff] | |
| parent | 342de69fa9d3e7202c606712f5803ed941d31d9c [diff] |
am 342de69f: am fffd02e9: (-s ours) am a8497f6f: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '342de69fa9d3e7202c606712f5803ed941d31d9c':