diff options
| author | Seth Raphael <magicseth@google.com> | 2014-05-21 21:43:22 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-21 21:43:22 +0000 |
| commit | b62bc74e2f1f0d926f467a58a30ef998f0ee76cf (patch) | |
| tree | aac1df30e9a0d9dfc964ad970fcb842008b89b91 /res | |
| parent | dc5243e6e9689c7ac4386862bb354e614d58f44f (diff) | |
| parent | 6fe6beb57c56547d88e96e312f623a9e1eeafad7 (diff) | |
| download | android_packages_apps_Camera2-b62bc74e2f1f0d926f467a58a30ef998f0ee76cf.tar.gz android_packages_apps_Camera2-b62bc74e2f1f0d926f467a58a30ef998f0ee76cf.tar.bz2 android_packages_apps_Camera2-b62bc74e2f1f0d926f467a58a30ef998f0ee76cf.zip | |
am 6fe6beb5: Merge "Fix the build" into ub-camera-everglades
* commit '6fe6beb57c56547d88e96e312f623a9e1eeafad7':
Fix the build
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/camera.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/res/layout/camera.xml b/res/layout/camera.xml index 2c7fa1d91..475f6dc4d 100644 --- a/res/layout/camera.xml +++ b/res/layout/camera.xml @@ -91,7 +91,7 @@ <View android:layout_width="fill_parent" android:layout_height="fill_parent" - android:background="@color/black" + android:background="@android:color/black" android:id="@+id/leftLetterBoxer1" android:visibility="gone" /> @@ -99,7 +99,7 @@ <View android:layout_width="fill_parent" android:layout_height="fill_parent" - android:background="@color/black" + android:background="@android:color/black" android:id="@+id/leftLetterBoxer2" android:visibility="gone" /> |