| commit | c5d9527ef9afcc59e700d3a4f0aa18831c2a9da0 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 13:13:28 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 13:13:28 2013 -0700 |
| tree | 63f5fd378c80fc9f7c33353cc9b128617229bae8 | |
| parent | afa8348248f9aa7cca59e1c74992fcd7ac6cbd90 [diff] | |
| parent | cc9002b131f42bfe2a0ad4aaded32f538fc663b5 [diff] |
am cc9002b1: am 666a30d5: am 63cc80ff: (-s ours) am 1419f206: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'cc9002b131f42bfe2a0ad4aaded32f538fc663b5':