OSDN Git Service

[automerger skipped] Merge "More descriptions on SubscriptionController#setPreferredD...
authorXiangyu/Malcolm Chen <refuhoo@google.com>
Tue, 9 Oct 2018 19:13:18 +0000 (12:13 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 9 Oct 2018 19:13:18 +0000 (12:13 -0700)
am: 4b61b0bdf1  -s ours

Change-Id: I14b83faa3d9d61e3e5de8f3a93a2e7f7104590d0


Trivial merge