OSDN Git Service

Merge \\"Don\\'t allow enable/disable of tuner on lockscreen\\" into nyc-dev am:...
authorJason Monk <jmonk@google.com>
Tue, 19 Jul 2016 20:45:23 +0000 (20:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 19 Jul 2016 20:45:23 +0000 (20:45 +0000)
am: 50805412c8

Change-Id: If06e1f171f9920f9d23d9b7fa79909b8da5f2173


Trivial merge