From 3c53ae35c53db9ea5c67a3c75ce8f41967de5a9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20Barth=C3=A9l=C3=A9my?= Date: Wed, 25 Feb 2015 22:29:09 +0100 Subject: [PATCH] Replace FrameLayout with merge tag. --- .../app/src/main/res/layout/activity_color_detail.xml | 4 ++-- CameraColorPicker/app/src/main/res/layout/activity_main.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CameraColorPicker/app/src/main/res/layout/activity_color_detail.xml b/CameraColorPicker/app/src/main/res/layout/activity_color_detail.xml index 2945a9d..23f53dd 100644 --- a/CameraColorPicker/app/src/main/res/layout/activity_color_detail.xml +++ b/CameraColorPicker/app/src/main/res/layout/activity_color_detail.xml @@ -1,4 +1,4 @@ - - + diff --git a/CameraColorPicker/app/src/main/res/layout/activity_main.xml b/CameraColorPicker/app/src/main/res/layout/activity_main.xml index 7cfa111..eec270a 100644 --- a/CameraColorPicker/app/src/main/res/layout/activity_main.xml +++ b/CameraColorPicker/app/src/main/res/layout/activity_main.xml @@ -1,4 +1,4 @@ - - +