tree a85a13aace175c1394d52ff1db6d66f496766964
parent 1d71ff7d73a4bafdda0d3dfb70df617020ecf1bd
parent 3d828aa727a1127c28c1a535aebceb3af992f569
author The Android Open Source Project <initial-contribution@android.com> 1371738013 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1371738013 -0700

am 3d828aa7: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '3d828aa727a1127c28c1a535aebceb3af992f569':
  JWR66O