OSDN Git Service

Merge "Catch (and ignore) any timeout exceptions when releasing WakeLock" into oc...
authorZheng Zhang <zhzh@google.com>
Mon, 7 Aug 2017 23:35:59 +0000 (23:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 7 Aug 2017 23:35:59 +0000 (23:35 +0000)
commitcce662f23d94e849e60c34ba3f68ce6efa2da53d
tree456754bd7494902c5451aca3918aa85c9d1a0873
parente4fa69b956c4a81243daa60c8c40da89c0f84264
parent3f0244158898ef0412e30e318df17d4b34ffb16d
Merge "Catch (and ignore) any timeout exceptions when releasing WakeLock" into oc-mr1-dev
am: 3f02441588

Change-Id: Idf7f29533bad1eb6c6b9ea8dc1ca9c60e63103d3