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:
6c7ea25
6f0d399
)
Merge "Fix parsing of kernel wakelocks" into nyc-dev
author
Adam Lesinski
<adamlesinski@google.com>
Fri, 20 May 2016 17:32:42 +0000
(17:32 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 20 May 2016 17:32:42 +0000
(17:32 +0000)
am:
6f0d399214
* commit '
6f0d3992149aa782450667ed750fe0c3cf8ee334
':
Fix parsing of kernel wakelocks
Change-Id: Ibc60849809b5553e820833437a9d2d47d065a38e
Trivial merge