OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5d60709
9468b48
)
Catch (and ignore) any timeout exceptions when releasing WakeLock
author
Zheng Zhang
<zhzh@google.com>
Wed, 9 Aug 2017 17:58:18 +0000
(17:58 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 9 Aug 2017 17:58:18 +0000
(17:58 +0000)
am:
9468b48565
-s ours
Change-Id: Ia1c10a46771ff4602a1005a3bf0bddaf6f1a70b6
Trivial merge