summaryrefslogtreecommitdiff
path: root/libs/hwui/ProgramCache.cpp
diff options
context:
space:
mode:
authorYasuhiro Matsuda <mazda@google.com>2015-09-02 14:31:26 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-02 14:31:26 +0000
commitfcf9ab5ab3e158cea2559ed4e7274dbfeb0a6e77 (patch)
treeb6b618aff85b0f88983ee76f31aa71e6956c38e1 /libs/hwui/ProgramCache.cpp
parent082fb1d8cb70952cda4d5ee1e79af3ee4572271a (diff)
parentebf9465d213336819b15e3b21d02afce64470d4f (diff)
am ebf9465d: resolved conflicts for merge of ef57e5e0 to stage-aosp-master
* commit 'ebf9465d213336819b15e3b21d02afce64470d4f': Add trace code to system server.
Diffstat (limited to 'libs/hwui/ProgramCache.cpp')
0 files changed, 0 insertions, 0 deletions