Merge "Follow framework refactoring." into nyc-dev

am: 297ce9a

* commit '297ce9aaf396ab35f28d6c84ad0b3f040494aaf9':
  Follow framework refactoring.
This commit is contained in:
Jeff Sharkey
2016-03-17 22:14:09 +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 -->