tree 7d9c084ba84fa5e088400d51cf1d3bca0aa7c82d
parent d76c723ebcf857661e65ac4aba9c1699f7e24163
parent 21fd269ea36601238317ace4f236e9157826f466
author Julia Reynolds <juliacr@google.com> 1461781624 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1461781624 +0000

Merge "Show 'on the lockscreen' setting in more contexts." into nyc-dev