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:27:04 +0000 (18:27 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 27 Apr 2016 18:27:04 +0000 (18:27 +0000)
commitae35c38fe7ee475a1c4c5a0386184ef7d682359b
tree7d9c084ba84fa5e088400d51cf1d3bca0aa7c82d
parentd76c723ebcf857661e65ac4aba9c1699f7e24163
parent21fd269ea36601238317ace4f236e9157826f466
Merge "Show 'on the lockscreen' setting in more contexts." into nyc-dev