tree b4f5daf93765e7d8b1322cff82518b23d59b23e9
parent 1656aa5b7d5afbdf7f887c93cab1e88bc26107a4
parent 844ebd767c01a7230e306b8c6af8f2319fa21d0c
author Ricky Wai <rickywai@google.com> 1467890314 +0000
committer android-build-merger <android-build-merger@google.com> 1467890314 +0000

Merge \\"Do not show user locked notification after reboot when there is no lock\\" into nyc-mr1-dev am: f32e96a8df
am: 844ebd767c

Change-Id: I07976d8ba15a94c71359c4723c64d9d9374ec2ba