tree f4a2baa04ef59804af24f9697c6c30a8ef37a7d9
parent ad7fd29b312bf588b2be3f799715f34ff8a6d46b
parent 5aac97cbfcb3f638805311ffe733e5bf6dc29747
author The Android Open Source Project <initial-contribution@android.com> 1376413918 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1376413918 -0700

am 5aac97cb: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release jb-mr2-zeroday-deb-release - do not merge

* commit '5aac97cbfcb3f638805311ffe733e5bf6dc29747':
  "JLS36B"
  JWR66X
  JSS15P