Merge "Use MANAGE_ROLLBACKS permission in SampleRollbackApp."

  -->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"

          package="com.android.sample.rollbackapp" >

    <uses-permission android:name="android.permission.TEST_MANAGE_ROLLBACKS" />

    <uses-permission android:name="android.permission.MANAGE_ROLLBACKS" />

    <application

        android:label="@string/title_activity_main">

        <activity