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