summaryrefslogtreecommitdiffstats
path: root/drm
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2015-01-23 20:57:30 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-23 20:57:30 +0000
commitd35c21207762c33c6f8f517e52533d6738d9adf0 (patch)
tree275774760d1438dd667a2423ec3ed82cc74d8dd6 /drm
parent882ffba6a98dbe97a07f094ce87d9b81b756971e (diff)
parent1f7101ee7096dc11cd212935d84c0f9a3376b061 (diff)
downloadframeworks_av-d35c21207762c33c6f8f517e52533d6738d9adf0.zip
frameworks_av-d35c21207762c33c6f8f517e52533d6738d9adf0.tar.gz
frameworks_av-d35c21207762c33c6f8f517e52533d6738d9adf0.tar.bz2
am 1f7101ee: am 64c496c8: Merge "Fix MTP delete" into lmp-mr1-dev
* commit '1f7101ee7096dc11cd212935d84c0f9a3376b061': Fix MTP delete
Diffstat (limited to 'drm')
0 files changed, 0 insertions, 0 deletions