tree ad8cf5c3bbf3274ed7206d05ec01beb53312480e
parent 562f6322e596b0e31cc295abd9ae75ce1a065082
parent ae35c38fe7ee475a1c4c5a0386184ef7d682359b
author Julia Reynolds <juliacr@google.com> 1461782264 +0000
committer android-build-merger <android-build-merger@google.com> 1461782264 +0000

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