OSDN Git Service

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

Change-Id: I580c95a189aee057a45bdb3ec14dbbf8befa2d7b


Trivial merge