tree 4c70291baed7c8023f0e2930b620716049eb03f6
parent cbc2c4f102d7c7cb6ca8d183173705fc87aacd7a
parent 1ffba4af4e98a4de8fce85875e0bb1a5c2cc51b8
author SongFerng Wang <songferngwang@google.com> 1614856388 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1614856388 +0000

Merge changes Ia99a4cf4,Ib31e23b8

* changes:
  [Testcase] To migration DisabledSubscriptionControllerTest
  Use SubscriptionManager.getResourcesForSubId to get Resources