tree c3c3d35ebb06e219bf41460f70c98ebd6ee828d3
parent aa0dbb25a0ae51a8e53018fe05bf59164d9804cb
parent 1c302cafdd793ae250f767b88da718b916751feb
author Jean-Baptiste Queru <jbq@google.com> 1363029761 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363029761 -0700

am 1c302caf: (-s ours) am c14a7fbd: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '1c302cafdd793ae250f767b88da718b916751feb':