Merge "Combine the USB accessory support library with the platform feature"

<!-- This is the standard feature indicating that the device supports USB accessories. -->

<permissions>

    <feature name="android.hardware.usb.accessory" />

    <library name="com.android.future.usb.accessory"

            file="/system/framework/com.android.future.usb.accessory.jar" />

</permissions>

<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2011 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>

    <library name="com.google.android.usb"

            file="/system/framework/com.google.android.usb.jar" />

</permissions>

LOCAL_MODULE_TAGS := optional

LOCAL_MODULE:= com.google.android.usb

LOCAL_MODULE:= com.android.future.usb.accessory

include $(BUILD_JAVA_LIBRARY)

 * limitations under the License.

 */

package com.google.android.usb;

package com.android.future.usb;

/**

 * A class representing a USB accessory.

 */

package com.google.android.usb;

package com.android.future.usb;

import android.content.Context;

import android.content.Intent;