tree 015741f55dccce7e3749a9c1b748f89619adcc04
parent 093e711412a1649d4d172d0f0ca2ee2e3b136a96
parent 7f7ff14add5c5df040d4501244bfe52a1cc2eda1
author Tyler Gunn <tgunn@google.com> 1479330459 +0000
committer android-build-merger <android-build-merger@google.com> 1479330459 +0000

Merge "Prevent modification of TTY setting while in video call or conf call." into nyc-mr2-dev
am: 7f7ff14add

Change-Id: Idd35c38018aff9127290775e525cc1baa59f8759