From: Maurice Lam <yukl@google.com>
Date: Wed, 9 Aug 2017 00:02:12 +0000 (+0000)
Subject: Merge "Show help string when onEnrollmentHelp() is called" am: 5a926705ef am: dbfde54... 
X-Git-Tag: android-x86-9.0-r1~220^2~1^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b2aa7e7da0ad4363df84b04a2a644991d42bd8d7;p=android-x86%2Fpackages-apps-Settings.git

Merge "Show help string when onEnrollmentHelp() is called" am: 5a926705ef am: dbfde54fb6 am: d415cbfc0d
am: 6b5f99bcbd

Change-Id: Ibf17029cec44e8767bf843358f497efebc9cec7d
---

b2aa7e7da0ad4363df84b04a2a644991d42bd8d7