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:
c650683
9646e08
)
[automerger skipped] Merge "DO NOT MERGE Fix flaky tests in OverheatAlarm feature...
author
Bill Lin
<lbill@google.com>
Fri, 22 Feb 2019 12:54:39 +0000
(
04:54
-0800)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 22 Feb 2019 12:54:39 +0000
(
04:54
-0800)
am:
9646e08b3f
-s ours
am skip reason: subject contains skip directive
Change-Id: I5818d275a7b9f988049c8118dbeeb0d82a15672f
Trivial merge