diff options
| author | Adrian Roos <roosa@google.com> | 2017-03-09 23:25:52 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-03-09 23:25:56 +0000 |
| commit | 7446235e7d3c6cbf918f4da102b293161ea168b3 (patch) | |
| tree | 08790ac7a2b6d094782b973c05154a3df8a593ed /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 394cf5e4568d500327d098a03769d19a15ade73c (diff) | |
| parent | c1b50324a2286b24b691b8a7190743cbc341727e (diff) | |
Merge changes Ie17eedfd,Icb80843a,If1619c10,Iee23682a
* changes:
AOD: Add wakelock for charging text while dozing
AOD: Show charging status on AOD1
AOD: Fix default for always-on setting
Revert "Revert "AOD: Refactor always on configuration""
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions