| commit | 9f7e9d8149bc85e13577a4974f1de7e45831fb9d | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 13:13:51 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 13:13:51 2013 -0700 |
| tree | b012d7678c9ba215c95a9c3b7b116efa3cc8d13f | |
| parent | 36f2f1b395a3c71a5f66e134accef3eff7664697 [diff] | |
| parent | 7259dfe62f35e663ca99a52f4c0596a6ec3a6a44 [diff] |
am 7259dfe6: am 342de69f: am fffd02e9: (-s ours) am a8497f6f: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '7259dfe62f35e663ca99a52f4c0596a6ec3a6a44':