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:44:42 +0000 (23:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 7 Aug 2017 23:44:42 +0000 (23:44 +0000)
commitc96c3075d1a68d922a025ac2f42e62a043f35801
treeade8755babce51f1a8b8dce14094c39563a9f571
parentce58090c0066b820e55970948f53948aae63334a
parentcce662f23d94e849e60c34ba3f68ce6efa2da53d
Merge "Catch (and ignore) any timeout exceptions when releasing WakeLock" into oc-mr1-dev am: 3f02441588
am: cce662f23d

Change-Id: Id1390ada1a67e47261eba2cf05b0e6f0817959a0