tree a23752aa3b8756c88bdde11458d76f9f04164133
parent 958e731633ccc639f78b9842abd833794173ce6d
parent 9b5a5a0f9dac0b5d7d540e1669bbccc74c1a37d2
author Jean-Baptiste Queru <jbq@google.com> 1363030470 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363030470 -0700

am 9b5a5a0f: am eb69ddd4: am c2e35f33: (-s ours) am 932e8e5d: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '9b5a5a0f9dac0b5d7d540e1669bbccc74c1a37d2':