diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2017-01-05 05:07:51 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-01-05 05:07:53 +0000 |
| commit | 9aa6d5771b1ea7f7b2aba97d8bf7925b761da726 (patch) | |
| tree | 7d472dcf88ad756e00bee8cf61ceee3b3a5672a5 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | ccd496043dfc703cf9ee2011cee4b3534beed7b7 (diff) | |
| parent | 38db07426c4fcd93d588be90f5030db8da1980fa (diff) | |
Merge changes from topic 'am-3372882dede549118c8d455a558b1c53'
* 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
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions