tree 1586e4d3a04a36390be4c01e52fbeeca061602bb
parent a34a0030b8171a8592aa8c3a2bc711748d54d8fd
parent 958e66fe1803a6bf5880ad11c43825aa5a55a260
author The Android Open Source Project <initial-contribution@android.com> 1368820781 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1368820781 -0700

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

* commit '958e66fe1803a6bf5880ad11c43825aa5a55a260':
  JWR46B
  "JWR46"