tree 0e465d8493941078a0d507e6b40a275b87b97b36
parent 0a1ae1bc56d086565e253ade942718911b3d376f
parent 3cceb2580484bb97d7665ad2eefe738c37e287d9
author TreeHugger Robot <treehugger-gerrit@google.com> 1502148530 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1502148530 +0000

Merge "Catch (and ignore) any timeout exceptions when releasing WakeLock" into oc-mr1-dev