commit | 84d3036cf9ee03e118b4cfa857d574e5d3684c98 | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Wed Feb 27 06:26:33 2013 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 27 06:26:33 2013 +0000 |
tree | b7c53bd53118cc6f5812d58e21941a06f4276dc0 | |
parent | bde267772d42cddf091ebcc2f18d95977ec6f9a5 [diff] | |
parent | ed9cc555ee69feb0a1b13caf29ffefa56cf51149 [diff] |
am ed9cc555: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'ed9cc555ee69feb0a1b13caf29ffefa56cf51149':