OSDN Git Service

Merge "Merge "Remove Conferenceable update squelching" into oc-dr1-dev am: 4b6ef9c92d...
authorBrad Ebinger <breadley@google.com>
Wed, 2 Aug 2017 23:54:47 +0000 (23:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 2 Aug 2017 23:54:47 +0000 (23:54 +0000)
am: e57175c090

Change-Id: I7f2776087d873bbd3c25c130a2ee14dfbe6bf7b5


Trivial merge