summaryrefslogtreecommitdiffstats
path: root/drm
diff options
context:
space:
mode:
authorDirk Dougherty <ddougherty@google.com>2013-08-23 10:21:07 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-08-23 10:21:07 -0700
commitb8d3a3de675a42b0eed6117eca509c42903d7ee3 (patch)
tree387fb09b1a1d96018bf6a78ab0ef763edc5da65c /drm
parentc78f39d8c2dbad2c7614cd49c8f9c6e628342bf5 (diff)
parent2a804e49ddabe79606948955c6d07b3fb8f2499d (diff)
downloadframeworks_base-b8d3a3de675a42b0eed6117eca509c42903d7ee3.zip
frameworks_base-b8d3a3de675a42b0eed6117eca509c42903d7ee3.tar.gz
frameworks_base-b8d3a3de675a42b0eed6117eca509c42903d7ee3.tar.bz2
am 2a804e49: am 1b6d1990: am 80bd95bf: Merge "Doc change: update Google Play policies descriptions." into jb-mr2-docs
* commit '2a804e49ddabe79606948955c6d07b3fb8f2499d': Doc change: update Google Play policies descriptions.
Diffstat (limited to 'drm')
0 files changed, 0 insertions, 0 deletions