diff options
author | Chavi Weingarten <chaviw@google.com> | 2018-03-19 17:40:31 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-03-19 17:40:31 +0000 |
commit | 22ab2b96363c335c8383893357d74c8021669df7 (patch) | |
tree | fb95d3f981a6b0119595a64f2cb910ee49d7670f /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
parent | 1b929db32d8e801a7cabbc7fb66915de73e23d34 (diff) | |
parent | 82a0ba843ba2b775a762de4aefb852140f07c3e4 (diff) |
Merge changes I72119772,I124e4cc0,I462d4dfc into pi-dev
* changes:
Clear all options from Task when any ActivityRecord consumes the options.
Revert "Set options on startingActivity instead of topActivity"
Revert "Set options for activity being brought to front."
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions