OSDN Git Service

Merge "Show \'on the lockscreen\' setting in more contexts." into nyc-dev am: ae35c38
authorJulia Reynolds <juliacr@google.com>
Wed, 27 Apr 2016 18:42:02 +0000 (18:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 27 Apr 2016 18:42:02 +0000 (18:42 +0000)
am: 8f2fd11

* commit '8f2fd1106c48588e9138714ce83da1d4f3656b26':
  Show 'on the lockscreen' setting in more contexts.

Change-Id: If4f1b16655504bfd407af415bdd27fec4d36ac6f


Trivial merge