Merge "Work on issue #36863299: [Fugu] CTS: PermissionFeatureTest failures:..." into oc-dev am: 8eb76853e6

am: e3b51f90a4

Change-Id: Ifbf34b586595e9ec4e2269e5bb5f039fe8b46abf
This commit is contained in:
Dianne Hackborn 2017-04-11 01:28:56 +00:00 committed by android-build-merger
commit dd993cb079

View file

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2017 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<permissions>
<!-- This is Android and fully CTS compatible. Basically this is for CTS tests to use. -->
<feature name="android.software.cts" />
</permissions>