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)

Trivial merge