diff options
| author | Raman Tenneti <rtenneti@google.com> | 2019-10-16 14:45:26 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-10-16 14:45:26 -0700 |
| commit | 2d22fac6f8f0679332da353c74ebbbaa19c43da1 (patch) | |
| tree | 2ee493037022abef2fabc50c810cb14dce4e8cd4 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | e0784ef31c56c137b3cd8527d292cea43fc2c0fc (diff) | |
| parent | 06097b72581ce5d9d7f4bf792b8206646676c0e5 (diff) | |
[automerger skipped] Merge "Re-enable the following tests in pre-submit: cts.AlarmManagerTest#testSetRepeating, cts.SystemFeaturesTest#testSensorFeatures" am: ebe03edac6
am: 06097b7258 -s ours
am skip reason: change_id Iffec912af4ee9dd3de2090a31bd475abc5016854 with SHA1 02cbff4425 is in history
Change-Id: Ia2d03791b3521f0c7b399fa1300107cd8f88bb52
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions