Merge \"Open Security Patch Bulletin\" into nyc-mr1-dev

am: 410273210d

Change-Id: Ia0e45925498c66af98a62725a02e1b31892dd01a
This commit is contained in:
Andrew Sapperstein
2016-07-14 13:59:18 +00:00
committed by android-build-merger

View File

@@ -84,11 +84,12 @@
android:summary="@string/device_info_default"/> android:summary="@string/device_info_default"/>
<!-- Security patch level --> <!-- Security patch level -->
<Preference android:key="security_patch" <PreferenceScreen android:key="security_patch"
android:enabled="false"
android:shouldDisableView="false"
android:title="@string/security_patch" android:title="@string/security_patch"
android:summary="@string/device_info_default"/> android:summary="@string/device_info_default">
<intent android:action="android.intent.action.VIEW"
android:data="https://source.android.com/security/bulletin/" />
</PreferenceScreen>
<!-- Device FCC equipment id --> <!-- Device FCC equipment id -->
<Preference android:key="fcc_equipment_id" <Preference android:key="fcc_equipment_id"