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)
commit1ec599f4477d844ffddbac887eeee53601c16990
tree1e5c8c86dc8bbe2e0c085c4bab5865436f839c55
parenta43fd2856ecdec86673269bfcf91dbc943ec61e2
parent482e35d51a01f2c45d54a593b03cb056a697197e
Merge "Merge "Merge "Remove Conferenceable update squelching" into oc-dr1-dev am: 4b6ef9c92d" into oc-mr1-dev am: e57175c090" into oc-mr1-dev-plus-aosp
am: 482e35d51a

Change-Id: I59d952ec0dd395d7b553ca4edb9b71c51a300b97