| commit | c1509400dcf79d65b2624e6fc6e7f667ff9edb29 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 20:49:20 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 20:49:20 2013 +0000 |
| tree | 797c4b3d81575250820a2bf59d97ad2086894eef | |
| parent | 1e928f404f83da6ed29dc3d0b28f0a376b12d327 [diff] | |
| parent | 5c19de4d070dfaebde92a5df4e54c959eef95cba [diff] |
am 5c19de4d: am 1d6e52d1: am 50d36d58: am 75bcd737: am 4ddcb758: (-s ours) am 9ef024ec: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '5c19de4d070dfaebde92a5df4e54c959eef95cba':