tree 88670f6823e78f2744704d23d799da90428a647c
parent c618d4f1008991ec6fe3d89adb83091e6d7cef73
parent f66a269fa4300fa691348bdd55a2a16ff55de608
author The Android Open Source Project <initial-contribution@android.com> 1375996453 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1375996453 -0700

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

* commit 'f66a269fa4300fa691348bdd55a2a16ff55de608':
  JWR66W
  JSS15O
  JLS36
  JSS15N
  "JSS15M"
  "JSS15L"
  "JSS15K"