OLD | NEW |
---|---|
1 <?xml version="1.0" encoding="utf-8"?> | 1 <?xml version="1.0" encoding="utf-8"?> |
2 | 2 |
3 <!-- Copyright (c) 2012 The Chromium Authors. All rights reserved. | 3 <!-- Copyright (c) 2012 The Chromium Authors. All rights reserved. |
4 | 4 |
5 Use of this source code is governed by a BSD-style license that can be | 5 Use of this source code is governed by a BSD-style license that can be |
6 found in the LICENSE file. | 6 found in the LICENSE file. |
7 --> | 7 --> |
8 | 8 |
9 <clip xmlns:android="http://schemas.android.com/apk/res/android"> | 9 <clip xmlns:android="http://schemas.android.com/apk/res/android"> |
10 <shape> | 10 <shape> |
11 <solid android:color="@android:color/holo_blue_light" /> | 11 <solid android:color="@android:color/holo_blue_light" /> |
12 </shape> | 12 </shape> |
13 <<<<<<< HEAD | |
nilesh
2012/09/24 20:46:41
Merge markers?
David Trainor- moved to gerrit
2012/09/24 23:39:57
Done.
| |
13 </clip> | 14 </clip> |
15 ======= | |
16 </clip> | |
17 >>>>>>> Add rendering support to the TestShell. | |
OLD | NEW |