OSDN Git Service

Merge "Merge "Disable notification sounds on TV" into oc-dev am: b5979092b8 am: 5ddad...
authorTony Mantler <nicoya@google.com>
Fri, 16 Jun 2017 22:39:01 +0000 (22:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 16 Jun 2017 22:39:01 +0000 (22:39 +0000)
am: f1854c0684

Change-Id: I64f523164c64e88b00c2388153e95d3e3d870afb


Trivial merge