Chalard Jean eb358dadac Merge "Have the status bar listen to all macro-users VPN changes." ...

am: b16a6053fe

Change-Id: Icc4fe4fbdb75c90abaaee8009f08f1220536686e

2018-03-23 09:22:36 +00:00

..

keyguard

Merge "Fix available/remaining PIN/PUK attempts."

2017-12-07 23:17:11 +00:00

systemui

Merge "Have the status bar listen to all macro-users VPN changes."

2018-03-23 09:22:36 +00:00