| commit | 64bb2d0a04b7b929309af0eb1b5b2f12d3ceee6c | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Feb 26 14:09:18 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Feb 26 14:09:18 2013 -0800 |
| tree | 3eac4e359b7139f9039a1120997af022a12c281c | |
| parent | 1e27876715f5e08d578f67e2c783d8ee47962590 [diff] | |
| parent | 40a2170e6bc5c122008bc7593da4ba9e655c6e7f [diff] |
am 40a2170e: am e75a8757: Reconcile with jb-mr1-release - do not merge * commit '40a2170e6bc5c122008bc7593da4ba9e655c6e7f':