summaryrefslogtreecommitdiff
path: root/libs/hwui/ProgramCache.cpp
diff options
context:
space:
mode:
author Geoff Mendal <mendal@google.com> 2015-02-27 00:50:50 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-02-27 00:50:50 +0000
commitef65538a7065d4caa4a3c5aae156d82645611277 (patch)
tree1bf933ea1eafaf54e768c580fdda84e590c3d474 /libs/hwui/ProgramCache.cpp
parent1e711d996936fa1fec356e3f24384d5613ba2688 (diff)
parent6de722ad64d29f2268f44a5aee61e4dd2685c450 (diff)
am 6de722ad: (-s ours) am 46c5d0b1: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master
* commit '6de722ad64d29f2268f44a5aee61e4dd2685c450': Import translations. DO NOT MERGE
Diffstat (limited to 'libs/hwui/ProgramCache.cpp')
0 files changed, 0 insertions, 0 deletions