tree acfc8b558580f0421840af5f9e94b328e18c1a90
parent 4caf0ebebbdd7514f4c12ae14b4cc537d504f20e
parent 6fdb2a116c95a51953cf2203b8af0ac84cbeb2b2
author Jean-Baptiste Queru <jbq@google.com> 1363031846 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363031846 -0700

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

* commit '6fdb2a116c95a51953cf2203b8af0ac84cbeb2b2':