tree bd1c9891381f95cab44fe9798496349539acc851
parent 9641bd36dbf0c4b1eeb84499b35c1cdb7fa5a530
parent 10f06dc0787c20d9ffab07e59654322b9348c056
author Jean-Baptiste Queru <jbq@google.com> 1363034669 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363034669 -0700

am 10f06dc0: am 0b904fda: am 93bb0058: am 4bcc1fdb: (-s ours) am b25a2fcf: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '10f06dc0787c20d9ffab07e59654322b9348c056':