summaryrefslogtreecommitdiff
path: root/libs/hwui/ProgramCache.cpp
diff options
context:
space:
mode:
author Ricardo Cervera <rcervera@google.com> 2015-01-16 20:06:53 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-01-16 20:06:53 +0000
commit23a6d889aa0cdcb244ccbe2b999a87e7ece7b7e5 (patch)
tree5db60d3ced0542b92be52f5cfe60bdb21288de7a /libs/hwui/ProgramCache.cpp
parentc952235d9f0539a1d76e82944b51e2f8a4fa6ef3 (diff)
parent1e59b338e6d1a270947908e53cefd088e2e38fb3 (diff)
am 1e59b338: am 08314642: am 90312d80: am 22878790: am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-dev
* commit '1e59b338e6d1a270947908e53cefd088e2e38fb3': docs: Added info on noHistory and onActivityResult(). Bug: 13807256
Diffstat (limited to 'libs/hwui/ProgramCache.cpp')
0 files changed, 0 insertions, 0 deletions