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