Merge "Use gallery icon for action bar app icon in camera." into jb-dev

    <application android:icon="@mipmap/ic_launcher_gallery" android:label="@string/app_name"

            android:name="com.android.gallery3d.app.GalleryAppImpl"

            android:theme="@style/Theme.Gallery"

            android:logo="@mipmap/ic_launcher_gallery"

            android:hardwareAccelerated="true">

        <uses-library android:name="com.google.android.media.effects" android:required="false" />

        <activity android:name="com.android.gallery3d.app.MovieActivity"