tree 68b4da9e56f1e40f17ee83d225dbd631a2043f56
parent 71ad7914aef61b7fd7785fd7db4a4e09a2be787f
parent 512d09d3ecfafc0d52055612a3536e8b20a7df93
author Jean-Baptiste Queru <jbq@google.com> 1363029760 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363029760 -0700

am 512d09d3: (-s ours) am 9bffd1e9: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '512d09d3ecfafc0d52055612a3536e8b20a7df93':