diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2011-05-26 12:22:08 +0800 |
|---|---|---|
| committer | Wu-cheng Li <wuchengli@google.com> | 2011-05-26 12:24:51 +0800 |
| commit | e005128299a7a690510fce8ad131537f0bb69250 (patch) | |
| tree | e5b3fd7e3b833428d7ba26ac8f864655cca4f2cb /res/layout/preview_frame_video.xml | |
| parent | f63363f2885f4c16546358a612aa4cc2b98430a4 (diff) | |
| parent | aae0cba54957cf0e6046d146aa018a4ed7a6f3b5 (diff) | |
| download | LegacyCamera-e005128299a7a690510fce8ad131537f0bb69250.zip LegacyCamera-e005128299a7a690510fce8ad131537f0bb69250.tar.gz LegacyCamera-e005128299a7a690510fce8ad131537f0bb69250.tar.bz2 | |
resolved conflicts for merge of aae0cba5 to master
Change-Id: I681c7f38abaed6705640c4e79e06a581990ec496
Diffstat (limited to 'res/layout/preview_frame_video.xml')
| -rw-r--r-- | res/layout/preview_frame_video.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/res/layout/preview_frame_video.xml b/res/layout/preview_frame_video.xml index ec0dbb5..7bb8fcc 100644 --- a/res/layout/preview_frame_video.xml +++ b/res/layout/preview_frame_video.xml @@ -19,7 +19,7 @@ android:layout_height="match_parent" android:layout_marginLeft="2dip" android:layout_weight="1"> - <!-- To be consistent with xlarge layout, preview border is not inside the preview frame. --> + <!-- To be consistent with w1024dp layout, preview border is not inside the preview frame. --> <ImageView android:id="@+id/preview_border" android:layout_width="match_parent" android:layout_height="match_parent" |