| commit | 270735fe2bc72a3931b6077b0740526ca00493d8 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 13:38:21 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 13:38:21 2013 -0700 |
| tree | 86232bccb843cf95925f98fc26ba1e2fef0f18f9 | |
| parent | d5598f9839ab1e35807eda7bef396a1a038a9a27 [diff] | |
| parent | 98a810d8ad8a968136eb7fa2d5c8ca7b25a08f28 [diff] |
am 98a810d8: am 8a6077ce: am f994bd37: am 8bf124f0: (-s ours) am ae812451: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '98a810d8ad8a968136eb7fa2d5c8ca7b25a08f28':