summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorAlex Klyubin <klyubin@google.com>2015-05-08 16:23:58 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-08 16:23:59 +0000
commit3974fb239392099608f969254c4d86e7d13ab32d (patch)
treea66c70a793f0f7061cb9e523f3795bd61106a5a6 /media
parent0dc0193307b9bb97aac1cfb79e56444578ba006e (diff)
parenteae1da7788f0f9f37fa142a2df34bfaec1f4253e (diff)
downloadframeworks_base-3974fb239392099608f969254c4d86e7d13ab32d.zip
frameworks_base-3974fb239392099608f969254c4d86e7d13ab32d.tar.gz
frameworks_base-3974fb239392099608f969254c4d86e7d13ab32d.tar.bz2
Merge "Replace "TEE" with "secure hardware"." into mnc-dev
Diffstat (limited to 'media')
0 files changed, 0 insertions, 0 deletions