tree b6d29a8453082c367b37ff620315121038f4bcdc
parent 7e51b8b671fbf134258b51f1f40c8096ccbbdd8d
parent bca6bd2b8c45020ec19e81b19b14370e72c03df4
author Fyodor Kupolov <fkupolov@google.com> 1493850374 +0000
committer android-build-merger <android-build-merger@google.com> 1493850374 +0000

Merge "Use timeout for *dexopt* wake lock" into oc-dev
am: bca6bd2b8c

Change-Id: If4bb1b78fc1cc3f8bc6987bd8bfcfa5738c5c0e9