am 165c67aa: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '165c67aacd8c6e8e6ffe57e673602952e4b56219':
  JOP15
  JOP14
  JOP13
  JOP12D
  JVP12C
  JOP12C
  JOP12B
  JVP12
  JOP12
  JOP11B
  JVP11
This commit is contained in:
The Android Open Source Project 2012-10-15 07:40:17 -07:00 committed by Android Git Automerger
commit 23717baba1

Diff content is not available