tree 5fa7786ade1bc93ac499db8db42eecdb9a7c64d3
parent 286374f16610323722ae4a3871be4b8d4c2b0001
parent c004cfd80c5b54c971b8854fa1d10ee23be1c868
author Jean-Baptiste Queru <jbq@google.com> 1363034657 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363034657 -0700

am c004cfd8: am b843601a: am 77acfc4d: (-s ours) am 3c73fdaa: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'c004cfd80c5b54c971b8854fa1d10ee23be1c868':