am 29b5e170: am 7fa9667f: Merge "Clarify how release of offline keys is handled in the MediaDrm API" into jb-mr2-dev
am 29b5e170: am 7fa9667f: Merge "Clarify how release of offline keys is handled in the MediaDrm API" into jb-mr2-dev

* commit '29b5e1701bdf06861d0eae4a3be05a7012c5e1c6':
  Clarify how release of offline keys is handled in the MediaDrm API

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base