diff options
| author | Makoto Onuki <omakoto@google.com> | 2016-07-20 00:24:42 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-20 00:24:42 +0000 |
| commit | c74ed0d6dc0bed7b778921faa6d1fe4801d5cb2f (patch) | |
| tree | c83962c206b640277180166f617b5f26b4f6d088 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 64baa7025da1c12dec1e55216d0fe32bd9e0e8c1 (diff) | |
| parent | ceadb1a86a00475d572a99053a0dcbd5bcc2f93d (diff) | |
Merge \"Stop adding FLAG_ACTIVITY_RESET_TASK_IF_NEEDED when...\" into nyc-mr1-dev
am: ceadb1a86a
Change-Id: If26f5a2e8f2a0533b145025734e5819e72a48b28
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions