am 10ce90ad: am eaebe4c1: Merge "Add new android.permission.CAMERA_DISABLE_TRANSMIT_LED" into jb-mr2-dev

* commit '10ce90adfafa25e417fdefa7510e53bc70bccd7b':
  Add new android.permission.CAMERA_DISABLE_TRANSMIT_LED