Merge "Add "Your work policy info" entry in Privacy settings" into qt-dev am: 9a1c75c57a am: 8573d27d31

am: aa813f5618

Change-Id: I2a1cb8143c105d4a03c4bffc34ba7bedfa9a83f4
This commit is contained in:
Ivan Podogov
2019-06-17 06:03:09 -07:00
committed by android-build-merger
9 changed files with 392 additions and 15 deletions

View File

@@ -24,4 +24,7 @@
<!-- Fake dimen value for restricted icon size - needed to get around Robolectric
issue loading framework hidden resources -->
<dimen name="restricted_icon_size">24dp</dimen>
</resources>
<!-- Fake string to avoid empty intent action -->
<string name="config_work_policy_info_intent_action">ACTION_SHOW_WORK_POLICY_INFO</string>
</resources>