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:
b418181
9282d72
)
Merge "Add config option to enable/disable pause workaround."
author
Tyler Gunn
<tgunn@google.com>
Mon, 14 Aug 2017 23:54:12 +0000
(23:54 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Mon, 14 Aug 2017 23:54:12 +0000
(23:54 +0000)
am:
9282d725f0
-s ours
Change-Id: I6e54ff11618e8a49cb20391f10f8f79adc61463d
Trivial merge