diff options
author | Kenny Guy <kennyguy@google.com> | 2017-03-14 12:30:33 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-03-14 12:30:33 +0000 |
commit | 22892f45b58f88850b7e6ca6a26f385f5799d0fc (patch) | |
tree | defd3f7e889355eca4919ffb24e703136be60ff4 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 376c6471da391d09e6a9d840321865a6871ccf14 (diff) | |
parent | 9b9158f9f9324cc4d171c329e7015ab21517a47b (diff) |
Merge "DO NOT MERGE Clear calling identity before checking if user is running." into nyc-dev am: 2df7f9f9c0 am: c5d86736d3 am: 00b77edec0 am: 11c5ff0399 am: d49386eaa5
am: 9b9158f9f9 -s ours
Change-Id: I71c292d901150c4328a1ae79df7e499cfdd52465
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions