OSDN Git Service

Merge "Show setting for work profile lock screen notification" into oc-dev am: 5bb87f9f34
authorFan Zhang <zhfan@google.com>
Thu, 25 May 2017 23:27:58 +0000 (23:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 25 May 2017 23:27:58 +0000 (23:27 +0000)
commit1f1fa944dbb639a8a3b139d372922e69214089cf
tree65b10b3b12aed32355d3fef8752f597b34abd4e5
parent5f5d409e54944ddba1df139eb9f0e51fe6a29b44
parente8e23081fa46053aab6a79af9f986f233b6093a8
Merge "Show setting for work profile lock screen notification" into oc-dev am: 5bb87f9f34
am: e8e23081fa  -s ours

Change-Id: Ie872c59887b02dedd73a89a024049226f87496ce