tree 00e7004af45893bbf047a860c428eeb0c6b1cab8
parent be6cd8f75c858d95ae44d3b220557473e695317a
parent 7bf0939e106c975ac897b5d701e116b6c86ab75a
author Jean-Baptiste Queru <jbq@google.com> 1363032830 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363032830 -0700

am 7bf0939e: am 7298e5ab: am 2f3c1638: (-s ours) am 89d125ec: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '7bf0939e106c975ac897b5d701e116b6c86ab75a':