diff options
| author | Sudheer Shanka <sudheersai@google.com> | 2016-06-22 00:08:09 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-22 00:08:09 +0000 |
| commit | 0195207b37e9b43199b79b4b56cea1c07b7f466f (patch) | |
| tree | f35db4dcf0cbb18666742a68f268dd8871da24e1 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 8186da583ae12ac37c52ae891ba53c3ad440a7fc (diff) | |
| parent | e8af546d371f8f4f6f38d95fbf4b85fcff483a26 (diff) | |
Merge \\\\\\\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\\\\\\" into lmp-dev am: e64034a27d -s ours am: db7e70c2f0 am: e0cc5e20ae am: 0d457d1254 -s ours am: 199f6a490a am: 06c3f60136 am: 9088be4ebe am: 95c9bef53b -s ours am: 00e79982aa
am: e8af546d37
Change-Id: I80240ac1163e2f2986ed639dc728945dabb97609
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions