OSDN Git Service

Merge "Show setting for work profile lock screen notification" into oc-dev
authorFan Zhang <zhfan@google.com>
Thu, 25 May 2017 23:16:54 +0000 (23:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 25 May 2017 23:16:54 +0000 (23:16 +0000)
commite8e23081fa46053aab6a79af9f986f233b6093a8
treec6f3115c0e8386cfcc6980e1877a6362e072e15b
parent9a091aaac00e401dcd44dc3cdf3e482cd292e7fd
parent5bb87f9f3418b9191316668570a22cde82d7c93c
Merge "Show setting for work profile lock screen notification" into oc-dev
am: 5bb87f9f34

Change-Id: Ie351c759cd700dc6d4ad28cee65d9106f491a59d