diff options
| author | Sudheer Shanka <sudheersai@google.com> | 2016-06-21 22:25:31 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-21 22:25:31 +0000 |
| commit | e0cc5e20aeba91689acd303d8694c8fa473526b8 (patch) | |
| tree | 55e07d239c1c780d949ba400e4e9cbba69af818a /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 918fb5d453118060f663e846e74ba7f00a0d8fb4 (diff) | |
| parent | db7e70c2f0b348ab7eab0edc427f3e38a357c668 (diff) | |
Merge \\"DO NOT MERGE: Reduce shell power over user management.\\" into lmp-dev am: e64034a27d -s ours
am: db7e70c2f0
Change-Id: I8ebc5346b9a8a38efa16f7bbd23ddaa97f3780e0
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions