diff options
author | Jeff Sharkey <jsharkey@android.com> | 2016-12-02 01:14:27 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-12-02 01:14:27 +0000 |
commit | 18ade37c6bfcad1fefb59b3e34d98ed3f8b237b1 (patch) | |
tree | fbad5e1a8de0a774e2c171755f5e715993d006f3 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | d9a7f113348248c78fd59e635ffb115a23659dc3 (diff) | |
parent | 32d2b4c7afa564bcba25cd73be3783878f0dd2fd (diff) |
Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into mnc-dr1.5-dev
am: 32d2b4c7af -s ours
Change-Id: Id4cf3526f7892971e4f226e98036166cbe8d28ef
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions