| commit | a1947074e608c1605606ed79ebbb0c51a04997dc | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Feb 26 22:13:46 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Feb 26 22:13:46 2013 +0000 |
| tree | 82817f05c52aca18025c0c54383341be709203bc | |
| parent | 92a74bf5342cc3e30194191e07befd8c5a6908dc [diff] | |
| parent | b8d37e7761166655c197aaf9622113676fa2971d [diff] |
am b8d37e77: (-s ours) am 1512e8a6: am f8313c34: am 669c3823: am 4aed7b07: Reconcile with jb-mr1-release - do not merge * commit 'b8d37e7761166655c197aaf9622113676fa2971d':