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:
ccd4960
38db074
)
Merge changes from topic 'am-3372882dede549118c8d455a558b1c53'
author
Android Build Merger (Role)
<android-build-merger@google.com>
Thu, 5 Jan 2017 05:07:51 +0000
(
05:07
+0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Thu, 5 Jan 2017 05:07:53 +0000
(
05:07
+0000)
* changes:
Merge changes from topics 'thermal-notif-3', 'thermal-notif' into nyc-mr2-dev am:
0c7631f8b0
am:
2380d82941
Added alert icon to high temp dialog. am:
bd4eeb7259
am:
b54a792429
Add VR mode check for thermal notification am:
d51ac7322e
am:
a477ead31c
Show notif when device reaches throttling temp am:
67e97053c5
am:
104c66d71e
-s ours
Trivial merge