tree b59d6a750d1a45eca77e6be2143fc9668d50fece
parent 81a0690f93c021e189976a476c20fc5aab4841a5
parent 79c111c58cf4b62c227fbff56ce97dbca4ba2f44
author Jean-Baptiste Queru <jbq@google.com> 1363030069 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363030069 -0700

am 79c111c5: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '79c111c58cf4b62c227fbff56ce97dbca4ba2f44':