diff options
author | Android Build Merger (Role) <android-build-merger@google.com> | 2017-06-28 20:04:10 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-06-28 20:04:10 +0000 |
commit | db7140b5193d2ea280f14ba8b18b905fb0213a28 (patch) | |
tree | 339ca4a690ff2474bd50c402c5a370c99ecc75c9 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 851f200b08850f52796bdf649cdba5f50d8e0a29 (diff) | |
parent | 59c00b98ad27146a0e987a645b12168bfdfe2847 (diff) |
Merge "Merge "Restrict launching activities on virtual displays" into oc-dev am: b0c5d67bf1 am: 6355cb7afa" into oc-dr1-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions