diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2016-12-02 02:16:11 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-12-02 02:16:15 +0000 |
| commit | acf9fdbc7522a8d51f272dad4afd199ac9abee1b (patch) | |
| tree | 6ed41290737606a89f8f9b3a42590a7aa4d034d4 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c70b994b41023a185c4c778ebe4480166e66b1d2 (diff) | |
| parent | 3c0346ed95072c766fba33d204785a36e8754289 (diff) | |
Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 1de465bec2 am: b9a0b79675 -s ours am: 1da786d723 am: af5f47caca am: ee8e0e8ae3 am: f70dd1fbc1 -s ours am: 60f17b8505 am: ca44afff8a am: f2688ddcb7 am: f5ab66fd9a am: c437780cfd" into nyc-mr2-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions