| commit | 8f2fd1106c48588e9138714ce83da1d4f3656b26 | [log] [tgz] |
|---|---|---|
| author | Julia Reynolds <juliacr@google.com> | Wed Apr 27 18:37:44 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Apr 27 18:37:44 2016 +0000 |
| tree | ad8cf5c3bbf3274ed7206d05ec01beb53312480e | |
| parent | 562f6322e596b0e31cc295abd9ae75ce1a065082 [diff] | |
| parent | ae35c38fe7ee475a1c4c5a0386184ef7d682359b [diff] |
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