summaryrefslogtreecommitdiffstats
path: root/telecomm
diff options
context:
space:
mode:
authorAdam Lesinski <adamlesinski@google.com>2014-06-10 01:30:05 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-06-10 01:30:05 +0000
commit3cfe720a0d250f7aac88fdd303bf34005ebb9ab7 (patch)
tree10c5d3e75c0345df432eac43e198d98a6a4383bd /telecomm
parente1ab884a67ecbb3cd879493364e9eb1f485d9023 (diff)
parent5fed49f7d614ae9e83db04703484b31c8077b78c (diff)
downloadframeworks_base-3cfe720a0d250f7aac88fdd303bf34005ebb9ab7.zip
frameworks_base-3cfe720a0d250f7aac88fdd303bf34005ebb9ab7.tar.gz
frameworks_base-3cfe720a0d250f7aac88fdd303bf34005ebb9ab7.tar.bz2
am 5fed49f7: am 4d9fcae2: Merge "Allow for a NoOp implementation of DrmManagerClientImpl" into klp-modular-dev
* commit '5fed49f7d614ae9e83db04703484b31c8077b78c': Allow for a NoOp implementation of DrmManagerClientImpl
Diffstat (limited to 'telecomm')
0 files changed, 0 insertions, 0 deletions