OSDN Git Service

Merge "Merge "Merge "Remove Conferenceable update squelching" into oc-dr1-dev am...
authorBrad Ebinger <breadley@google.com>
Thu, 3 Aug 2017 01:19:47 +0000 (01:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 3 Aug 2017 01:19:47 +0000 (01:19 +0000)
am: 482e35d51a

Change-Id: I59d952ec0dd395d7b553ca4edb9b71c51a300b97


Trivial merge