| commit | ae35c38fe7ee475a1c4c5a0386184ef7d682359b | [log] [tgz] |
|---|---|---|
| author | Julia Reynolds <juliacr@google.com> | Wed Apr 27 18:27:04 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Apr 27 18:27:04 2016 +0000 |
| tree | 7d9c084ba84fa5e088400d51cf1d3bca0aa7c82d | |
| parent | d76c723ebcf857661e65ac4aba9c1699f7e24163 [diff] | |
| parent | 21fd269ea36601238317ace4f236e9157826f466 [diff] |
Merge "Show 'on the lockscreen' setting in more contexts." into nyc-dev