diff options
| author | Suprabh Shukla <suprabh@google.com> | 2016-07-13 20:33:42 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-13 20:33:42 +0000 |
| commit | 4fe9ec3925463cd4b7ef3915e180e6a81298f2e7 (patch) | |
| tree | 23aad50cdf45d93e8c96cb1f3057dd8d6b7579fd /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c7b4815f232b3bf3dd19e1f8f164303ebcb4692a (diff) | |
| parent | d940c86d954e395c2f4e9e0faebfecb931f86799 (diff) | |
Merge \\"Disallowing bluetooth config for demo users\\" into nyc-mr1-dev am: 0ce03e77bc
am: d940c86d95
Change-Id: Ib74555bb264e26678077c33e4f66afb68c0226dd
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions