tree e0c31bf436958ff16224f6ae982346dc1f00e8f6
parent bacdfc0ed9a0882ee3e9ee889a8fd4cabb9a71f3
parent b843601a9de78a0015c8d963187efaa530e46d46
author Jean-Baptiste Queru <jbq@google.com> 1363032399 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363032399 -0700

am b843601a: am 77acfc4d: (-s ours) am 3c73fdaa: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'b843601a9de78a0015c8d963187efaa530e46d46':