commit fc28b80a2502b78830b346f77ce85cdc7c0be690
author Takayuki Hoshi <hoshi@google.com> Fri Feb 06 07:31:01 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 06 07:31:01 2015 +0000
tree c394bcd45b26b0a600c9e11188c03f07e25575ae
parent 0f37a9d02f9071dc456acf3b8dd977ce9cdac5b1
parent b5679b61a290041034d74c4167b0f1518568a92a

am b5679b61: Merge "Fix MonkeyApp so it keeps the current screen orientation on TVs" into lmp-sprout-dev

* commit 'b5679b61a290041034d74c4167b0f1518568a92a':
  Fix MonkeyApp so it keeps the current screen orientation on TVs

hostsidetests/monkey/test-apps/CtsMonkeyApp/AndroidManifest.xml

diff --git a/hostsidetests/monkey/test-apps/CtsMonkeyApp/AndroidManifest.xml b/hostsidetests/monkey/test-apps/CtsMonkeyApp/AndroidManifest.xml
index 849d6a4..a3dfc83 100644
--- a/hostsidetests/monkey/test-apps/CtsMonkeyApp/AndroidManifest.xml
+++ b/hostsidetests/monkey/test-apps/CtsMonkeyApp/AndroidManifest.xml
@@ -18,14 +18,14 @@
 
     <application android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
 
-        <activity android:name=".MonkeyActivity" android:screenOrientation="portrait">
+        <activity android:name=".MonkeyActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         
-        <activity android:name=".BaboonActivity" android:screenOrientation="portrait">
+        <activity android:name=".BaboonActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.MONKEY" />