tree 6ca371850e886b2f2f5af475eca9f9287b37ad2e
parent 9dbc1c81e6f3a2d74fac2a84c8df0da0bb2336fc
parent a54b8f03a312f5ca433c96303321057b16d68c7a
author Tyler Gunn <tgunn@google.com> 1479331210 +0000
committer android-build-merger <android-build-merger@google.com> 1479331210 +0000

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

Change-Id: Iea7ad6279ee955636ed6c9edbc7d11ceff4d8b20