tree 7e09dcf61e9a816e79b3b1849ac42094ec766968
parent 42d96a40123e409be8076f01b45dd422dad01209
parent 9bc8a1b206dcd1ebba2738778ba32d25524a4f4b
author The Android Open Source Project <initial-contribution@android.com> 1371581483 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1371581483 -0700

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

* commit '9bc8a1b206dcd1ebba2738778ba32d25524a4f4b':
  "JSR78B"