| commit | 1467dfa5cd28b8b4e07cfe86b020a07bd0d0da24 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 19:41:34 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 19:41:34 2013 +0000 |
| tree | 94a4d6555ccfc85af79cfe0cffe5be2782f07ab5 | |
| parent | 9969b48d235e71f87be67549fdd274c8e82f3f6f [diff] | |
| parent | a60f38181465d5f5a37ea8f9ad34326ea2e21ef0 [diff] |
am a60f3818: am b2525ba8: am 7915b22e: am a4b20d71: am b8e1033c: (-s ours) am e5412a9a: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'a60f38181465d5f5a37ea8f9ad34326ea2e21ef0':