summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorRoshan Pius <rpius@google.com>2020-02-19 16:28:43 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-02-19 16:28:43 +0000
commitbd8dd47fdecea6b803744a80459aadaa23789b79 (patch)
treeed44c28f3857ae949ab600c83255f099da744f1a /tools/aapt2/java/JavaClassGenerator_test.cpp
parentb4358fdfd5777325afc6c7987bf00d6e705a33f5 (diff)
parent6d4cb9cdc78cf920ec91ecac41a2b8f127706eb4 (diff)
Merge changes from topics "ap_shutdown_timeout_flag", "scan_always_available_API"
* changes: WifiOemMigrationHook: Migrate Settings global values WifiManager: Add API for scan always available toggle SoftApConfiguration: Add shutdown enabled method
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions