tree 257e3dcf4801f649618a44c453253c016d953903
parent 85f8faa65754011161f40b2047fa19a6128ba88c
parent 93bb0058bd3e5c0703797289f88a033789249766
author Jean-Baptiste Queru <jbq@google.com> 1363032042 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363032042 -0700

am 93bb0058: am 4bcc1fdb: (-s ours) am b25a2fcf: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '93bb0058bd3e5c0703797289f88a033789249766':