am ad808f5d: (-s ours) Reconcile with jb-release - do not merge

* commit 'ad808f5da422b13489edb04b38daf871e5f977a6':
  JRO03L
  JRO03K
  JRO03J
  JRO03I
This commit is contained in:
The Android Open Source Project 2012-08-03 13:25:06 -07:00 committed by Android Git Automerger
commit fa3c2d9a76

Diff Content Not Available