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:
b39ca7f
ddf77e1
)
Merge "DO NOT MERGE ANYWHERE Fix system watchdog timeout when reading too many usage...
author
Joe LaPenna
<jlapenna@google.com>
Thu, 12 Nov 2015 23:27:43 +0000
(23:27 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 12 Nov 2015 23:27:43 +0000
(23:27 +0000)
am:
ddf77e14e5
-s ours
* commit '
ddf77e14e5d6a5b8aa61c0a9f82c099468129df7
':
DO NOT MERGE ANYWHERE Fix system watchdog timeout when reading too many usage events.
Trivial merge