summaryrefslogtreecommitdiff
path: root/libs/hwui/ResourceCache.cpp
diff options
context:
space:
mode:
author Michael Runge <mrunge@google.com> 2014-12-18 01:59:10 +0000
committer android-build-merger <android-build-merger@google.com> 2014-12-18 01:59:10 +0000
commit647beed62236c996b946e85d06fdf4335b6a2a80 (patch)
treee897b24742625771034ea522546c0a2df030fb8a /libs/hwui/ResourceCache.cpp
parent3a586c032c2cf39da72882c6466aa198ec7c85dc (diff)
parent8deabad541984571496456646d6a7a91eccc9e42 (diff)
am 37fed329: Merge "Increase timeout when uncrypting OTA" into lmp-mr1-dev
automerge: 8deabad * commit '8deabad541984571496456646d6a7a91eccc9e42': Increase timeout when uncrypting OTA
Diffstat (limited to 'libs/hwui/ResourceCache.cpp')
0 files changed, 0 insertions, 0 deletions