tree d3c0442a4a690c0529233883b77ba3afcb870418
parent 051a1740eb434e317451c09b72ae09c81cbfa1c1
parent 9bfdf4d539d011f0be59370d61dcbf257b3ae578
author The Android Open Source Project <initial-contribution@android.com> 1371238673 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1371238673 -0700

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

* commit '9bfdf4d539d011f0be59370d61dcbf257b3ae578':
  JWR66M