summaryrefslogtreecommitdiffstats
path: root/drm/jni
diff options
context:
space:
mode:
authorDeepanshu Gupta <deepanshu@google.com>2014-08-06 22:05:38 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-08-06 22:05:38 +0000
commit72cf03a27a73e91d4a3eabf74e0384b310f4a5b2 (patch)
treedaedb43ca33e5c9cf2aebc4cf0fff80019530247 /drm/jni
parent8c71ff298b10ebdd3e5dec6f69f70176161b7e0a (diff)
parent3a544a81b3d2d529b2995f4b5db2077760d440b5 (diff)
downloadframeworks_base-72cf03a27a73e91d4a3eabf74e0384b310f4a5b2.zip
frameworks_base-72cf03a27a73e91d4a3eabf74e0384b310f4a5b2.tar.gz
frameworks_base-72cf03a27a73e91d4a3eabf74e0384b310f4a5b2.tar.bz2
am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs
* commit '3a544a81b3d2d529b2995f4b5db2077760d440b5': Fix SystemProperties in LayoutLib.
Diffstat (limited to 'drm/jni')
0 files changed, 0 insertions, 0 deletions