OSDN Git Service

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

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

Change-Id: If68301e5aea27bb82d5c1fa5ebae0833bcdeab02