OSDN Git Service

Merge "DO NOT MERGE Expose phone account register/unregister intents." into oc-dev...
authorTyler Gunn <tgunn@google.com>
Mon, 17 Apr 2017 18:09:20 +0000 (18:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 17 Apr 2017 18:09:20 +0000 (18:09 +0000)
am: e935b6e544  -s ours

Change-Id: Icd8f538d2cd20ead660376ca7bd7f2fbf6348aea


Trivial merge