tree acfc8b558580f0421840af5f9e94b328e18c1a90
parent 188bd32cb36757ca2a007b66becdaf31abed41af
parent 61c0f4fa6f2e3049018f70706227cc256a529801
author Jean-Baptiste Queru <jbq@google.com> 1363029781 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363029781 -0700

am 61c0f4fa: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '61c0f4fa6f2e3049018f70706227cc256a529801':