| commit | b037a8706d394afd803af6a20fe7cae0d9248e30 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 12:41:20 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 12:41:20 2013 -0700 |
| tree | 6c4f311d515d62a63a4bc090fc55f76f614b7d14 | |
| parent | 5a176f73dbb2bff2ca8b8f86af86a17be6863b87 [diff] | |
| parent | b9de449616f5f0ab8eb6e819bb581f9c353316f9 [diff] |
am b9de4496: am 9b5a5a0f: am eb69ddd4: am c2e35f33: (-s ours) am 932e8e5d: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'b9de449616f5f0ab8eb6e819bb581f9c353316f9':