tree a15617143de70aabef74b4a09320a87181981985
parent aa54f436cdafec3594c93525339ca39c87c729d0
parent 1d0c7e05d80ab18c1a859782313448dc6a31bab9
author Jean-Baptiste Queru <jbq@google.com> 1363030879 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363030879 -0700

am 1d0c7e05: am 6e5236ee: am 5c8f84a1: am 3a18bccc: (-s ours) am 431cd416: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '1d0c7e05d80ab18c1a859782313448dc6a31bab9':