summaryrefslogtreecommitdiff
path: root/libs/hwui/Program.cpp
diff options
context:
space:
mode:
author Zach Jang <zachjang@google.com> 2015-09-16 01:40:18 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2015-09-16 01:40:18 +0000
commit32a420ea36fbae07484f6fcf718ed97865ca3158 (patch)
treee97ef844fae798f7d4d188cf02eb57231ab9a38a /libs/hwui/Program.cpp
parent203b43547da94c9fb78931680b99f9db49fc46c9 (diff)
parent3ee9945be3adc94fea7c01129014bc8d848df0a1 (diff)
Merge "Revert "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