am c43e8a9c: (-s ours) Reconcile with jb-mr1.1-release - do not merge

# By The Android Automerger
# Via The Android Automerger (11) and The Android Open Source Project (1)
* commit 'c43e8a9c':
  JDQ36
  JDQ32B
  JDQ32
  JDQ30
  JDQ29C
  JDQ29B
  JDQ29
  JDQ28
  JDQ23
  JDQ18
  JDQ16
  JDQ10
  JDQ09