summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorMichal Karpinski <mkarpinski@google.com>2016-12-14 10:44:19 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-12-14 10:44:23 +0000
commitd9eb4fce7d4ac9afc75c08de09001630465a2140 (patch)
treedb8b499c902884fe499716581c18831de132e279 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parent3661a6f91b29de855597effaed555f64e316f458 (diff)
parente3639a0a073d5ae406989b85e370ab5e3c90ff57 (diff)
Merge changes from topic 'network-logging-nyc-mr2-dev' into nyc-mr2-dev
* changes: DO NOT MERGE Fixes in comments for NetworkEvent, DnsEvent and ConnectEvent DO NOT MERGE Fix Lint errors for network logging API DO NOT MERGE Logging when the new batch of network logs broadcast is sent to DO DO NOT MERGE Disable DO single user features when clearDeviceOwner() is called regardless of the amount of users DO NOT MERGE Fix disabling DO single user features when clearDeviceOwner() is called DO NOT MERGE [DPM] Minor code fixes in NetworkLoggingHandler DO NOT MERGE [DPM] DO uses batch token to retrieve network logs, and can retrieve the same batch many times DO NOT MERGE [DPM] Management and retrieval of network logs DO NOT MERGE [DPM] DO can start network logging and listen for events
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions