diff options
| author | Zoltan Szatmary-Ban <szatmz@google.com> | 2016-06-02 17:00:57 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-02 17:00:57 +0000 |
| commit | ba526c47bb0de254a4e866ee4dbddf1b9c4f6d71 (patch) | |
| tree | 36459b6a4d70ec0b67c6843a5f95d8b77d12db0c /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 8cecff8883ec8f0d4eef334aa7f39ac0e2df9e1b (diff) | |
| parent | 2d74e17bb0fe0bf9b52332f2664460a8a54549ec (diff) | |
Merge "Merge "Only reset global restriction owner on DO->PO for the right user" into nyc-dev am: 2002061f34 am: 6b9371ceef" into nyc-mr1-dev-plus-aosp
am: 2d74e17bb0
* commit '2d74e17bb0fe0bf9b52332f2664460a8a54549ec':
Change-Id: I6da0fd5a265c4ccec729f1b583e5ebd6e96f164c
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions