diff options
| author | ltrochtova <ltrochtova@google.com> | 2016-12-05 15:57:33 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-12-05 15:57:33 +0000 |
| commit | e1e2c1f1dad3ad471520d1544057f6c984f299ec (patch) | |
| tree | 220f455c3e24aea49c189893f8565b6262c3d9cd /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 85bfbf1f6218c6d6bcafe4f888aa188c10ee01a5 (diff) | |
| parent | ad5eb744aa84271ed5fdad7fcedfa3ac3d2f9445 (diff) | |
Merge "Introduce a new user restriction for disallowing Bluetooth." am: 5fb37a7641 -s ours am: 8058dc0e82 -s ours
am: ad5eb744aa -s ours
Change-Id: I2468b18021198c8b1a7dfa739d28ec1aaafba9b1
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions