diff options
| author | Rubin Xu <rubinxu@google.com> | 2017-04-25 13:50:10 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-04-25 13:50:10 +0000 |
| commit | 59c65a8a84bd8eb457fa5b8fe9201a4afddf6b36 (patch) | |
| tree | 4e789e5f9075f815deb2a79964fa30538a2296ed /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 442a4e4c91083cd3a1c7020760e1cc106d229eef (diff) | |
| parent | 4f86a894e124989ce7c4d1d8f9f6536a9f820399 (diff) | |
Merge "Introduce KEYSTORE_FLAG_CRITICAL_TO_DEVICE_ENCRYPTION" into oc-dev
am: 4f86a894e1
Change-Id: I0947dbaa1eb840bffd7299d9fe8a9f6aea118a47
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions