tree a3cb96b245a471727e75e38d46253f9a066974bc
parent bbcaabe40dc47ec73bc590357c99b33779584414
parent a5c0f26e51af0218ab94c3ce62bce77d669d3361
author Xiangyu/Malcolm Chen <refuhoo@google.com> 1543343778 -0800
committer android-build-merger <android-build-merger@google.com> 1543343778 -0800

[automerger skipped] Merge "Clean up SubMgr#getOpportunisticSubscriptions." am: 103d515c80 am: b4750ecffa
am: a5c0f26e51  -s ours

Change-Id: I0f2859d8d3a9596d32f4e6062363ea72318de0d1