Merge "Move set work lock message from header to footer" into tm-dev am: 6e4579a816 am: 938200e3a8 am: 1376048722 am: a8e882ba52
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18140207 Change-Id: I40b95575258dedf8ed05c6480f329b9f6fba10e5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: