| commit | ac17bedebf85c7cdd8cb040a14d58132ba488309 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 13:44:25 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 13:44:25 2013 -0700 |
| tree | 6cf4deac21ad2f9b4520a8f59ba2b07dcf2d2b53 | |
| parent | 3003231360b9c32727f6139e2c8e52f7cc2a83f0 [diff] | |
| parent | 52805b91b5a4d8a48ed76c0c879b9041051d507e [diff] |
am 52805b91: am 1d9e1671: am e5af0899: am f31bca4f: (-s ours) am 2d9e4e9f: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '52805b91b5a4d8a48ed76c0c879b9041051d507e':