diff options
| author | Amith Yamasani <yamasani@google.com> | 2016-06-02 18:07:13 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-02 18:07:13 +0000 |
| commit | 0e29599ffc4dc7fc7e8e2b0e2d4f64cd68f8fb4f (patch) | |
| tree | b846898586c7adf8af4e1ab16f4aaef7f1de7182 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 9d5c0b1c8eee5848df6a99f64ae9438a4642492d (diff) | |
| parent | 64fc84e9c78e143e79a0e5b2dddf97f02d1f40d9 (diff) | |
Merge "Setup user restrictions for demo user" into nyc-mr1-dev am: a28576cb72
am: 64fc84e9c7
* commit '64fc84e9c78e143e79a0e5b2dddf97f02d1f40d9':
Setup user restrictions for demo user
Change-Id: I414145f63da75daa63f25879dc2ef8ee167cef10
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions