tree b9c2fd27be969c99ebb0805ac56eceb0c9292dde
parent 432fb0358bed649748cb41c25a46eacacdcc874c
parent 47db7adcca3ebfd5fd3c0cded7b33d65fbad6480
author Mark Chien <markchien@google.com> 1572507968 -0700
committer android-build-merger <android-build-merger@google.com> 1572507968 -0700

Merge "[Tether04] Migrate EntitlementManager into module"
am: 47db7adcca

Change-Id: I661a6e77caf100016757ffb95cd2cbdc57243ffb