summaryrefslogtreecommitdiffstats
path: root/data/videos
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2014-08-15 22:35:51 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-08-15 22:35:51 +0000
commit7969be0bb858c2fdc69b72f7c8f90f1dcdba3395 (patch)
tree94f6d08290ab11bcf9cb897270fd3577fd9cdaf6 /data/videos
parentfc5f24d874e36d9e2bb73b21e6ed7fcac0e1d80c (diff)
parent5c7015d764e55d60100670fad5d3c0ca40adebf5 (diff)
downloadframeworks_base-7969be0bb858c2fdc69b72f7c8f90f1dcdba3395.zip
frameworks_base-7969be0bb858c2fdc69b72f7c8f90f1dcdba3395.tar.gz
frameworks_base-7969be0bb858c2fdc69b72f7c8f90f1dcdba3395.tar.bz2
am 5c7015d7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '5c7015d764e55d60100670fad5d3c0ca40adebf5': Import translations. DO NOT MERGE
Diffstat (limited to 'data/videos')
0 files changed, 0 insertions, 0 deletions