diff options
author | Shawn <wahi.shawn@gmail.com> | 2017-10-12 18:30:55 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-10-12 18:30:55 +0000 |
commit | 1c2718b778ae97c37501e160e8067e325c319798 (patch) | |
tree | 3caca22052f226db1a4f7c90109dc070028fd345 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | aaa64d0ac62755c2d60f99b3be9ab5e441596bbc (diff) | |
parent | 61fbefbbab67d5431e3957a721454c9fae62ef88 (diff) |
Merge "DO NOT MERGE Update demo mode time to 8:00 for Android 8.0" am: afc4e370cd -s ours am: bad318fc93 -s ours am: dc2917fbf1
am: 61fbefbbab -s ours
Change-Id: I56c6857f42bbb8e950805633f599b138f7b8ca08
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions