OSDN Git Service

[automerger skipped] Merge "Revert "Revert "Update SubscriptionInfo o use strings...
authorHall Liu <hallliu@google.com>
Tue, 17 Jul 2018 00:30:20 +0000 (17:30 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 17 Jul 2018 00:30:20 +0000 (17:30 -0700)
am: a4480d33e2  -s ours

Change-Id: I2470d095213d72e8a6c96c657778b8d9db66001d


Trivial merge