summaryrefslogtreecommitdiffstats
path: root/drm/libdrmframework/plugins/forward-lock/internal-format/common/Android.mk
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2015-01-23 19:58:36 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-23 19:58:36 +0000
commit1f7101ee7096dc11cd212935d84c0f9a3376b061 (patch)
tree7fb64dfadc976e6f489f6fba2280643f6a0bae47 /drm/libdrmframework/plugins/forward-lock/internal-format/common/Android.mk
parentd8aff827c3c7d1396b624b1462c81e415ef3c160 (diff)
parent64c496c8d51c71605cd34a510da2ecd8180656ec (diff)
downloadframeworks_av-1f7101ee7096dc11cd212935d84c0f9a3376b061.zip
frameworks_av-1f7101ee7096dc11cd212935d84c0f9a3376b061.tar.gz
frameworks_av-1f7101ee7096dc11cd212935d84c0f9a3376b061.tar.bz2
am 64c496c8: Merge "Fix MTP delete" into lmp-mr1-dev
* commit '64c496c8d51c71605cd34a510da2ecd8180656ec': Fix MTP delete
Diffstat (limited to 'drm/libdrmframework/plugins/forward-lock/internal-format/common/Android.mk')
0 files changed, 0 insertions, 0 deletions