tree 2d317cdbede6c4a618913d409746b35242ba5ec2
parent aa4f7f18ef6e211ec38cd5f351d1002960f4b87b
parent e995e98d067e489fe8ba904b24c3691e8c052f93
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1578936972 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1578936972 +0000

Merge "Add config_tether_* and entitlement resources" am: 2a27a6ade1 am: 18af5a920d am: e995e98d06

Change-Id: I1e89bd103c3886a48eeba4cb454845bb01f232f3