merge in jb-mr2-release history after reset to jb-mr2-dev
am 45d59a99: Merge "Make MediaDrm APIs public" into jb-mr2-dev

* commit '45d59a997f639662e4ce427933d81667fee39bcd':
  Make MediaDrm APIs public
am 9968b523: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '9968b523e53dd16a4d8fad207d435abd2eaf266f':
  Import translations. DO NOT MERGE
am 7f6fc129: Merge "Add CellInfoWcdma and related classes." into jb-mr2-dev

* commit '7f6fc12997d67ae80a044bc0b4cc17797d887911':
  Add CellInfoWcdma and related classes.
Merge "Fixed the problem ime invisible status despite being the icon that appears in the statusbar."
am 467a052e: Magnification does not work if no enabled accessibility services.

* commit '467a052e159d5dc87b27ce94f8559576ec73040b':
  Magnification does not work if no enabled accessibility services.
am 5d1a182a: Merge "Secure broadcasts." into jb-mr2-dev

* commit '5d1a182a8a2dd9613ef3b1f2de7b6a3d690ae890':
  Secure broadcasts.
am d3f9ffe2: Merge "Prevent transformed ops from merging in the first place" into jb-mr2-dev

* commit 'd3f9ffe28d1599e40f8c9a7c0c32465324bb2828':
  Prevent transformed ops from merging in the first place
am b2df0b60: Merge "Remove BluetoothAdapterCallback. Simplify leScan Api" into jb-mr2-dev

* commit 'b2df0b60d0995c760fc7ee3776caa0fc7f84066a':
  Remove BluetoothAdapterCallback. Simplify leScan Api
am adff8b75: Merge "Add Javadoc" into jb-mr2-dev

* commit 'adff8b7577490bbeaedcd584a19eb5310f6ccbc5':
  Add Javadoc
am 70e37696: Merge "Fix ActionBar#setHomeActionContentDescription(0)" into jb-mr2-dev

* commit '70e376964be45525f1f0e90f35570415dce6d1df':
  Fix ActionBar#setHomeActionContentDescription(0)
am d2fe47fc: Merge "don\'t trigger a render when setting the rendermode" into jb-mr2-dev

* commit 'd2fe47fcbe329ada690e8e66d8d359813597c459':
  don't trigger a render when setting the rendermode
am a454c573: Merge "Sent hint to Wifi driver when enabling WFD." into jb-mr2-dev

* commit 'a454c5732cacffdda53ae277b1e43d87b43044b1':
  Sent hint to Wifi driver when enabling WFD.
am 1a546dca: Merge "Fixed the problem ime invisible status despite being the icon that appears in the statusbar."

* commit '1a546dca77b47b86c87ddf4de7a76662ef8bd48b':
  Fixed the problem ime invisible status despite being the icon that appears in the statusbar.
am 9bc3386e: Merge "Once again, cancel all when notifications canceled for pkg." into jb-mr2-dev

* commit '9bc3386e1dfacf6544039dc9f66d07b827632f23':
  Once again, cancel all when notifications canceled for pkg.
am c884a08e: Merge "Improve error handling for DRM errors reported by plugins" into jb-mr2-dev

* commit 'c884a08e8c450682f3fe83576fb9e89f8337146e':
  Improve error handling for DRM errors reported by plugins
am 5a02663d: Merge "Doc change: Eat some permissions group comments." into jb-mr2-dev

* commit '5a02663d08a4a52a73a2bd181969cac4a3fb10e1':
  Doc change: Eat some permissions group comments.
am a407994b: Merge "Reload accessibility service infos for reisntalled packages." into jb-mr2-dev

* commit 'a407994bad9f6d5c2b9a8446e7c3354b753279a1':
  Reload accessibility service infos for reisntalled packages.
am 688a6977: Replacing accessibility service permissions with capability attributes.

* commit '688a6977cf7673ed0542ab3d839053c4e38a4dbd':
  Replacing accessibility service permissions with capability attributes.
am f06396da: Merge "Fix issue #8656537: API review: styles, assist" into jb-mr2-dev

* commit 'f06396dae8ad9f6ac2ca2a6afb459f0e106cd786':
  Fix issue #8656537: API review: styles, assist