tree 382a6a39aaa685a86a498060cd6e8081572a7324
parent 1a15b24bdd6a42b1c0c36e06c58d408af6eb276b
parent ed9cc555ee69feb0a1b13caf29ffefa56cf51149
author Jean-Baptiste Queru <jbq@google.com> 1361917626 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1361917626 -0800

am ed9cc555: Reconcile with jb-mr1-release - do not merge

* commit 'ed9cc555ee69feb0a1b13caf29ffefa56cf51149':