diff options
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2019-06-07 09:44:50 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-06-07 09:44:50 +0000 |
| commit | 94cc108048fb2b28fa64f1ba04a830877be88b65 (patch) | |
| tree | 477abccafc1cf711234de17ca1e35448dc7723da /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 27e91edd6bcc9180d4b4bec4098484761ad29e78 (diff) | |
| parent | 6382ad92b0f50867eb28e8d47a726ae2f5401bba (diff) | |
Merge changes from topic "am-9a435ce648dc47d49fc32dc2680fa5b7" into qt-r1-dev-plus-aosp
* changes:
Revert "Take all VPN underlying networks into account when migrating traffic for" am: ac06c1022d am: 3e9726c69c
Revert "NetworkStatsService: Fix getDetailedUidStats to take VPNs into account." am: 055992b112 am: 9b8282b7ba
Revert "Addressing comments for http://ag/7700679." am: 1fbf261c01 am: 25f881d116
Revert "Add one more test for VPN usage stats." am: 54a08a686d am: 469ee82902
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions