OSDN Git Service

Merge "Fix bug in getCallWaiting api." am: eb4e5318f2
authorSanket Padawe <sanketpadawe@google.com>
Wed, 8 Mar 2017 21:24:48 +0000 (21:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 8 Mar 2017 21:24:48 +0000 (21:24 +0000)
am: 1ee4605786

Change-Id: If75c7a23571a549afa1f13ac38c1d1d5db11fb3b


Trivial merge