tree b6f96eb94c9d52c53779ef6a6cf01b02ed80ab16
parent 01554fc890ba0aa11202ebaa9056cb4f83a41f95
parent 90aa9d848485a9209e80b1beadecf8dd3ba3553c
author The Android Open Source Project <initial-contribution@android.com> 1372204935 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1372204935 -0700

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

* commit '90aa9d848485a9209e80b1beadecf8dd3ba3553c':
  JWR66Q
  "JSR85"
  JSR78D