| commit | 5ecd1fb939643be14a18de4cbaabbb682c7d38cc | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 13:44:30 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 13:44:30 2013 -0700 |
| tree | 0e04c44b14eeda062116c7598542125bcc66d795 | |
| parent | 9f635dd94465e4dc324c6c4c15d081d1b18b5693 [diff] | |
| parent | ac8948419bef4b76342c85884d01557ae6a5f91e [diff] |
am ac894841: am 3b1c6f2d: am 68958526: (-s ours) am 04cc08fc: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'ac8948419bef4b76342c85884d01557ae6a5f91e':