diff options
| author | Charles He <qiurui@google.com> | 2017-08-15 22:23:55 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-08-15 22:23:55 +0000 |
| commit | 2a9b5933fcc1db2118e705dec2d7b0f3186fd814 (patch) | |
| tree | 231ba01a657167b3f8e37591011ce26667e9eeef /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 2308e829007ae5287755e191aa30309797989f4a (diff) | |
| parent | 417557193cda1e1266d6d367ff79f65f2323004d (diff) | |
Merge "Merge "[automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0 am: 1cd9e8096f am: 6dfc8d8d4d am: a3c1de7e49 am: 4acf4fabf4 am: 40317127f4 am: 159cd14334 am: 24587d57cf am: 0fa9328b80 am: 51ca967453" into oc-dr1-dev-plus-aosp am: 5ee440bbcc" into oc-mr1-dev-plus-aosp
am: 417557193c
Change-Id: Id68f2e8108f281a971d4adf8dfa17762f862df9d
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions