tree aac84b8b1ae1d4ac5597604dd78ec3f4adfd551d
parent 4268bedeade97138e826aec05f6ca23ef115dfa5
parent 20e0dc38628875408e7f0e7f4f0e4c47088792d9
author Chad Brubaker <cbrubaker@google.com> 1493676767 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1493676771 +0000

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"