tree b7c53bd53118cc6f5812d58e21941a06f4276dc0
parent bde267772d42cddf091ebcc2f18d95977ec6f9a5
parent ed9cc555ee69feb0a1b13caf29ffefa56cf51149
author Jean-Baptiste Queru <jbq@google.com> 1361946393 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1361946393 +0000

am ed9cc555: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'ed9cc555ee69feb0a1b13caf29ffefa56cf51149':