tree b79e53246bc8d355060d957d2d8c6c7fb6a8de10
parent 006c299b71047aaec0a26b33b80bd86ac8dedf68
parent 4b9e5566861568cf032db663b487c627d9a53772
author Hall Liu <hallliu@google.com> 1468863878 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1468863880 +0000

Merge "Check for PROPERTY_IS_DOWNGRADED_CONFERENCE in addExistingConnection" into nyc-mr1-dev