OSDN Git Service

Merge "DO NOT MERGE. Update lockscreen message when user unlocked." into nyc-mr1-dev
authorJeff Sharkey <jsharkey@android.com>
Wed, 31 Aug 2016 23:30:00 +0000 (23:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 31 Aug 2016 23:30:00 +0000 (23:30 +0000)
commit444af99af6ba4e1a7c84e059e4ff534bfb8b7334
tree0206ced5902ba652e5d0717171795b6fcfb990c7
parentbe4949f489b2d528d4e70ae5bb2b87541bdf786e
parent26887dc880ed78949d50c4392f3d6674931e0ef9
Merge "DO NOT MERGE. Update lockscreen message when user unlocked." into nyc-mr1-dev
am: 26887dc880

Change-Id: If086b75dd28b0838cd576469eb4ad05deea01d50