tree 8aa72ea9ce96e177cfbb7b9713362e0fa844d1f2
parent 66ad116909c3fe1bb60af3f228dc7b06b9e2d1d7
parent cbec21ad422e36d784e481da905ec44ac0cee673
author Jean-Baptiste Queru <jbq@google.com> 1363032829 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363032829 -0700

am cbec21ad: am f0f706bc: am dda70146: (-s ours) am 77a62c8b: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'cbec21ad422e36d784e481da905ec44ac0cee673':