summaryrefslogtreecommitdiff
path: root/libs/hwui/PathCache.cpp
diff options
context:
space:
mode:
author John Reck <jreck@google.com> 2015-05-14 14:51:06 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-05-14 14:51:06 +0000
commita0f6b87bbbbc10700aa14d2c4d9191fe1f064a60 (patch)
treeff8a7b2404f4903f5404a49b02cec6c2a052df53 /libs/hwui/PathCache.cpp
parentfa660f79e9551ca46efa6eaed26cff06095fbcd8 (diff)
parent570b2052bb8eec8c510941b0a6d77262df28b922 (diff)
am 570b2052: (-s ours) DO NOT MERGE resolved conflicts for merge of 951f2347 to lmp-mr1-ub-dev
* commit '570b2052bb8eec8c510941b0a6d77262df28b922': Revert "DO NOT MERGE Backport of limited jank-tracking metrics"
Diffstat (limited to 'libs/hwui/PathCache.cpp')
0 files changed, 0 insertions, 0 deletions