diff options
| author | Chad Brubaker <cbrubaker@google.com> | 2017-05-01 22:12:47 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-05-01 22:12:51 +0000 |
| commit | bd20a7b263ae82ccaaf805e7219116228a5d06f3 (patch) | |
| tree | aac84b8b1ae1d4ac5597604dd78ec3f4adfd551d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 4268bedeade97138e826aec05f6ca23ef115dfa5 (diff) | |
| parent | 20e0dc38628875408e7f0e7f4f0e4c47088792d9 (diff) | |
Merge changes from topic 'aia_settings_overlay' into oc-dev
* changes:
Add overlay for Instant Apps Settings whitelists
Revert "Allow Instant Apps to read Settings defined by apps"
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions