| commit | 1499ff67f2af8d5d9ab4aa850d7bf60a4d226e1a | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Feb 26 22:13:53 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Feb 26 22:13:53 2013 +0000 |
| tree | 90dc91444db562bf593dbf7969f9d4c569a88be4 | |
| parent | e7aa76d98aa5c12017c51369379fe97b0de508e1 [diff] | |
| parent | 64bb2d0a04b7b929309af0eb1b5b2f12d3ceee6c [diff] |
am 64bb2d0a: am 40a2170e: am e75a8757: Reconcile with jb-mr1-release - do not merge * commit '64bb2d0a04b7b929309af0eb1b5b2f12d3ceee6c':