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:
dba1031
289ccbd
)
Merge "continue read file when returned count > 0" am: 894c578a02 am: 2a82e9a69c
author
Ganesh Mahendran
<opensource.ganesh@gmail.com>
Wed, 13 Mar 2019 08:24:38 +0000
(
01:24
-0700)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 13 Mar 2019 08:24:38 +0000
(
01:24
-0700)
am:
289ccbd48d
Change-Id: I8921e6be0760cdedef05c74ae1e77e18b9bd2b04
1
2
core/java/com/android/internal/os/KernelWakelockReader.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/java/com/android/internal/os/KernelWakelockReader.java
Simple merge