diff options
author | Adrian Roos <roosa@google.com> | 2017-08-23 20:51:45 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-08-23 20:51:45 +0000 |
commit | f5c9bd16af097cf869b1ee04feb84086265cc601 (patch) | |
tree | 0f0c1094c334fedb47f67cad24db5c3e360b3bc2 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 62169aa0db668396fdde2b1ac6e1bfca1bdcabb9 (diff) | |
parent | e45c956f69c0c8a86c49f2fd3af9b4c4153757cc (diff) |
Merge "Ambient Display: Delay charging indicator if about to wake up" into oc-mr1-dev
am: e45c956f69
Change-Id: Icb6e18a867302d85d877d9bf4a8d33836eac9539
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions