diff options
| author | Amith Yamasani <yamasani@google.com> | 2011-05-27 10:24:59 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-05-27 10:24:59 -0700 |
| commit | a4fa2cd1c007c2bd0f330f6a3ffde2949d9574c5 (patch) | |
| tree | aae376a23c6aef524515d4b2921730162d8ea2dd /tests | |
| parent | eb2466b30362ef8374680a76a5e39a2ccdcdeedd (diff) | |
| parent | 405c1af75607fafdb1d6faf34e13e032e4934787 (diff) | |
| download | frameworks_base-a4fa2cd1c007c2bd0f330f6a3ffde2949d9574c5.zip frameworks_base-a4fa2cd1c007c2bd0f330f6a3ffde2949d9574c5.tar.gz frameworks_base-a4fa2cd1c007c2bd0f330f6a3ffde2949d9574c5.tar.bz2 | |
Merge "Manual merge. Preference activity changes to work on smaller tablet screens and phones."
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/BiDiTests/res/layout/canvas.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/BiDiTests/res/layout/canvas.xml b/tests/BiDiTests/res/layout/canvas.xml index 371cc23..77007af 100644 --- a/tests/BiDiTests/res/layout/canvas.xml +++ b/tests/BiDiTests/res/layout/canvas.xml @@ -31,4 +31,4 @@ android:background="#FF0000" /> -</LinearLayout>
\ No newline at end of file +</LinearLayout> |