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