am 8b8092aa: am 3974d3d4: am ef1d4b66: Merge "Make Theme a DropDownPreference" into mnc-dev

* commit '8b8092aa0995e403cba09b19f955aa2bef00974a':
  Make Theme a DropDownPreference
This commit is contained in:
Jason Monk
2015-06-01 20:33:09 +00:00
committed by Android Git Automerger
4 changed files with 36 additions and 17 deletions

View File

@@ -113,4 +113,9 @@
<!-- Confirm device credentials screen -->
<attr name="confirmDeviceCredentialsSideMargin" format="dimension" />
<attr name="confirmDeviceCredentialsTopMargin" format="dimension" />
<declare-styleable name="DropDownPreference">
<attr name="android:entries" />
<attr name="android:entryValues" />
</declare-styleable>
</resources>