| commit | 1f1fa944dbb639a8a3b139d372922e69214089cf | [log] [tgz] |
|---|---|---|
| author | Fan Zhang <zhfan@google.com> | Thu May 25 23:27:58 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu May 25 23:27:58 2017 +0000 |
| tree | 65b10b3b12aed32355d3fef8752f597b34abd4e5 | |
| parent | 5f5d409e54944ddba1df139eb9f0e51fe6a29b44 [diff] | |
| parent | e8e23081fa46053aab6a79af9f986f233b6093a8 [diff] |
Merge "Show setting for work profile lock screen notification" into oc-dev am: 5bb87f9f34 am: e8e23081fa -s ours Change-Id: Ie872c59887b02dedd73a89a024049226f87496ce