diff options
author | Neil Fuller <nfuller@google.com> | 2019-07-03 22:09:36 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-07-03 22:09:36 -0700 |
commit | 8fc0b40168916758c2b456edc810dfc54e448f26 (patch) | |
tree | f5dc8134f96a33177e9da17856f491a2d24dfe01 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 081664254a3dd12ed8fe47fe7219e3f84845bcad (diff) | |
parent | c66dbd75612c38022ace45d32d9e6d7a63757371 (diff) |
[automerger skipped] Merge "Remove the ability to turn off TimeDetectorService" am: 71fd6f0113 am: 8f8f4da0ca am: 4b8b022d6f
am: c66dbd7561 -s ours
am skip reason: change_id Iad7ff59b19fa54750831819c68b7b733e5763902 with SHA1 bef7e809ed is in history
Change-Id: I83435e93e0c0ffe663dfeae06665c508c80ac454
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions