diff options
author | Roshan Pius <rpius@google.com> | 2019-12-09 17:08:30 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-12-09 17:08:30 +0000 |
commit | 3f9ba67fa70aeda4aa0863f0cbef0b8150b9e58b (patch) | |
tree | 05a13697d95d660555b5869526a496be1ac6ad97 /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | 3a83bc234b5c2e44083a8a6be4f9f7b98bc9740c (diff) | |
parent | f65210645434399e981dafac2755600b028faed7 (diff) |
Merge changes from topics "suggestion_no_uid_package", "wifi_key_value_list_parser", "wifi_power_profile", "wifi_service_manager_getService", "wifi_westworld"
* changes:
statsd: Allow wifi mainline module to log its metrics
wifi-services-srcs: Stop using KeyValueListParser from android.internal
WifiNetworkSuggestion: Don't store packageName/uid
WifiAwareManager: Add requestMacAddresses @hide API
UserManager: Add StringDef for all restrictionKey values
WifiActivityEnergyInfo: Use time values for energy calculation
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions