diff options
| author | Jim Miller <jaggies@google.com> | 2016-06-29 00:56:31 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-29 00:56:31 +0000 |
| commit | a8788a94a297dc4a6f75a3bc95f7b32f67697063 (patch) | |
| tree | 24f085b3672e79e52b4e4f3e0e94adc9f5cd09ca /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 8927ac14806ef6cbf37ff381d74ba2e58ea8144e (diff) | |
| parent | ad2bf7dfc92cf523b1dcbd01ae08497168d26c85 (diff) | |
Merge \"Merge \\\"Relax security constraint around getAuthenticatorId().\\\" into nyc-dev am: 60c04126c9 am: ef26bf0f0a\" into nyc-mr1-dev-plus-aosp
am: ad2bf7dfc9
Change-Id: I192de1fa8729395fda7e2d5479d3bd2b36bbc440
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions