tree 46661b5229a1933625ab85150aa2c09affaa5d8b
parent a25b9b83bf925b6c703e274833b42bf1db2d443a
parent ab9fd481634f7b32ad9d697fc6a57212c1fbf039
author The Android Open Source Project <initial-contribution@android.com> 1369232648 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1369232648 -0700

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

* commit 'ab9fd481634f7b32ad9d697fc6a57212c1fbf039':
  "JWR52"
  JWR51B