OSDN Git Service

Merge "Add getSelfManagedPhoneAccounts() TelecomManager API." am: c4ea961f91 am:...
authorTyler Gunn <tgunn@google.com>
Mon, 10 Apr 2017 22:30:16 +0000 (22:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 10 Apr 2017 22:30:16 +0000 (22:30 +0000)
am: 1c80ac52fe  -s ours

Change-Id: I7a8b098fd65ba6c0aaf37ed51e662e3066bdba5f


Trivial merge