chrome/android/testshell/res/drawable/progress.xml - Issue 10968003: Add rendering support to the TestShell.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/android/testshell/res/drawable/progress.xml

Issue 10968003: Add rendering support to the TestShell. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased on top of test apk changes. Created 8 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chrome/android/testshell/res/drawable/progress.xml

diff --git a/chrome/android/testshell/res/drawable/progress.xml b/chrome/android/testshell/res/drawable/progress.xml

index 93322b91b6d33c0399e6dfd2474dc5fc754d9e2c..3080abb1a9144ab9e11c56cf3954c558e25e873f 100644

--- a/chrome/android/testshell/res/drawable/progress.xml

+++ b/chrome/android/testshell/res/drawable/progress.xml

@@ -10,4 +10,8 @@

<shape>

</shape>

+<<<<<<< HEAD

nilesh 2012/09/24 20:46:41 Merge markers?

David Trainor- moved to gerrit 2012/09/24 23:39:57 Done.

</clip>

+=======

+</clip>

+>>>>>>> Add rendering support to the TestShell.