OSDN Git Service

Merge "Merge "Remove Conferenceable update squelching" into oc-dr1-dev am: 4b6ef9c92d...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Wed, 2 Aug 2017 23:13:43 +0000 (23:13 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 2 Aug 2017 23:13:43 +0000 (23:13 +0000)

Trivial merge