am c1213473: Reconcile with jb-mr2-release - do not merge

* commit 'c1213473de0890856341bed09ef08b14603ddb30':
  "JWR11"
  JWR10C
This commit is contained in:
The Android Open Source Project 2013-04-11 07:47:12 -07:00 committed by Android Git Automerger
commit b6bfe68df8

Diff content is not available