tree 8b0845810159cdc1cd6d5e5f338f1e5ccd0638a5
parent 12b61826cdee963d0d01f29bf03c11f735f08a41
parent 91e4fd6c92a179bd1ee21c584bae0807e94487e0
author Jean-Baptiste Queru <jbq@google.com> 1371186319 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1371186319 -0700

am 91e4fd6c: am 61ea9d98: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '91e4fd6c92a179bd1ee21c584bae0807e94487e0':