OSDN Git Service

Merge "Merge "Remove Conferenceable update squelching" into oc-dr1-dev am: 4b6ef9c92d...
authorBrad Ebinger <breadley@google.com>
Thu, 3 Aug 2017 00:36:19 +0000 (00:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 3 Aug 2017 00:36:19 +0000 (00:36 +0000)
commitd161b06cf764a7da75572fab73b321a10e7571fc
tree87f510086dad928a6332201625648cb71316d516
parentcfcf0787a2e6f48b9a7a4fe33ab4a563291046d2
parentb22e5a3b26603bb433813f4b9acb21e35a24e34e
Merge "Merge "Remove Conferenceable update squelching" into oc-dr1-dev am: 4b6ef9c92d am: 27d9ca08da" into oc-mr1-dev-plus-aosp
am: b22e5a3b26

Change-Id: I693583e03a714bb4d8dbd2b6aefdb862ac0c0cdd