summaryrefslogtreecommitdiff
path: root/libs/hwui/ResourceCache.cpp
diff options
context:
space:
mode:
author Robin Lee <rgl@google.com> 2015-01-08 22:48:54 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-01-08 22:48:54 +0000
commit1ea47aa0839bb33c6bd5223c37d38616edc57181 (patch)
tree953c52900da56fb9a6cb914dfa31de45f4af7864 /libs/hwui/ResourceCache.cpp
parentadf1c93ff77c996be7952f98b9f554befb089543 (diff)
parenta92da1c21aba700519f51f690fad28e6ca4154a6 (diff)
am a92da1c2: am 2cc617b2: Merge "Revert "Profile owner hint in warning for extra CAs"" into lmp-mr1-dev automerge: bc7efed
* commit 'a92da1c21aba700519f51f690fad28e6ca4154a6': Revert "Profile owner hint in warning for extra CAs"
Diffstat (limited to 'libs/hwui/ResourceCache.cpp')
0 files changed, 0 insertions, 0 deletions