summaryrefslogtreecommitdiff
path: root/libs/hwui/ProgramCache.cpp
diff options
context:
space:
mode:
author Victoria Lease <violets@google.com> 2012-10-30 13:31:36 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2012-10-30 13:31:36 -0700
commit1863738c776b52d6d6f3133f659cdfbcf87ed3b9 (patch)
treed6b1f204970e7f4acb46d7b3c01f76047de86528 /libs/hwui/ProgramCache.cpp
parent54f1ce1d2bece0829c04ad062859ccc5651c6c3a (diff)
parentac14efce4b9575ac1de567073d7088162d4d2eed (diff)
am ac14efce: (-s ours) Merge "DO NOT MERGE suggest LocationRequest rather than Criteria" into jb-mr1-dev
* commit 'ac14efce4b9575ac1de567073d7088162d4d2eed': DO NOT MERGE suggest LocationRequest rather than Criteria
Diffstat (limited to 'libs/hwui/ProgramCache.cpp')
0 files changed, 0 insertions, 0 deletions