| commit | 624eac3d7700b400d15472cd8a9811c6228eec83 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Feb 26 22:43:22 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Feb 26 22:43:22 2013 +0000 |
| tree | 5847a21e278629cf9508ff2dc4080a8a2f9cc255 | |
| parent | 17100f3976a537a4d037b1f27fd643fafd2abc79 [diff] | |
| parent | 8298c5b8ffbf0d8d172a9394e3a9a9cf8ec7e554 [diff] |
am 8298c5b8: am 94c31c85: am d4ed4363: (-s ours) am 909960ad: (-s ours) am ed9cc555: Reconcile with jb-mr1-release - do not merge * commit '8298c5b8ffbf0d8d172a9394e3a9a9cf8ec7e554':