Merge "Follow framework refactoring." into nyc-dev am: 297ce9a

am: 2758b99

* commit '2758b99e9d1ea7cec97e7c92ddc668ec5e4b0d84':
  Follow framework refactoring.
This commit is contained in:
Jeff Sharkey
2016-03-17 22:18:16 +00:00
committed by android-build-merger

View File

@@ -91,8 +91,8 @@
android:supportsRtl="true" android:supportsRtl="true"
android:allowBackup="false" android:allowBackup="false"
android:usesCleartextTraffic="true" android:usesCleartextTraffic="true"
android:forceDeviceEncrypted="true" android:defaultToDeviceProtectedStorage="true"
android:encryptionAware="true"> android:directBootAware="true">
<!-- Settings --> <!-- Settings -->