OSDN Git Service

Merge \\"Remove RemoteInput on lockscreen setting\\" into nyc-dev am: a66746d167
authorAdrian Roos <roosa@google.com>
Fri, 17 Jun 2016 06:50:22 +0000 (06:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 17 Jun 2016 06:50:22 +0000 (06:50 +0000)
am: 0f93a4ebe9

Change-Id: I0bafce17d126c057bc1f62f78a3efa00feb84960


Trivial merge