am 3e68d87d: am f8814489: Merge "Update compatibility library tests" into jb-mr1-dev

$(call add-clean-step, rm -f $(PRODUCT_OUT)/system/media/video/Disco*)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/ImageProcessing_intermediates)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/ImageProcessing2_intermediates)

# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

# ************************************************

                android:id="@+id/filterselection"

                android:layout_width="fill_parent"

                android:layout_height="wrap_content"/>

            <Spinner

                android:id="@+id/spinner1"

                android:layout_width="fill_parent"

                android:layout_height="wrap_content"/>

            <TextView

                android:id="@+id/slider1Text"

                android:layout_width="match_parent"

                android:layout_marginRight="10sp"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"/>

            <Button

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:text="@string/benchmark_all"

                    android:onClick="benchmark_all"/>

            </LinearLayout>

    </ScrollView>

</LinearLayout>

    <string name="gamma">Gamma</string>

    <string name="saturation">Saturation</string>

    <string name="benchmark">Benchmark</string>

    <string name="benchmark_all">Benchmark All</string>

</resources>