tree e2db39ccfe47b2c53d09a41fda250da8298ea8f7
parent 858dfecf6db216e3a9ff30b6a38a8e1bf6da6733
parent 381868f347d413a671a6ad9c0af64d258a060b99
author Jean-Baptiste Queru <jbq@google.com> 1371187987 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1371187987 -0700

am 381868f3: (-s ours) am 840d233c: am 800e4320: am 63c34b5e: am 68719a17: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '381868f347d413a671a6ad9c0af64d258a060b99':