summaryrefslogtreecommitdiff
path: root/libs/hwui/Program.cpp
diff options
context:
space:
mode:
author Zach Jang <zachjang@google.com> 2015-09-16 01:37:36 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2015-09-16 01:37:36 +0000
commit203b43547da94c9fb78931680b99f9db49fc46c9 (patch)
treebd3926702fbad81601a45bbb8087232806cf9f6d /libs/hwui/Program.cpp
parenteb26f5cecd5366b29b3cb746a7edaf3769f40480 (diff)
parent3b49affdb3e18bbe48fc7ab00ccbe2c073b7e35e (diff)
Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev
Diffstat (limited to 'libs/hwui/Program.cpp')
0 files changed, 0 insertions, 0 deletions