tree eaa823a6a891e4669eefe9aab966fe59a4783429
parent 9b7e8fc7c564b24a1c099dddae4e9c1126bd7c4e
parent 72c7cf9d13f5a51a71dccc6d94317727bd0feec3
author Jean-Baptiste Queru <jbq@google.com> 1363032027 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363032027 -0700

am 72c7cf9d: am a1b1e2de: (-s ours) am 56f387a4: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '72c7cf9d13f5a51a71dccc6d94317727bd0feec3':