Commit a2368e30 authored Apr 18, 2016 by Android Build Merger (Role) Committed by Android (Google) Code Review Apr 18, 2016

Merge "Show work challenge in if user in docked stack is locked am: 853304c0...

Merge "Show work challenge in if user in docked stack is locked am: 853304c0 am: d9db7c76" into nyc-mr1-dev-plus-aosp

There are no changes