Move ui and content resources into one location.

android_webview/build/jarjar-rules.txt

Index: android_webview/build/jarjar-rules.txt
diff --git a/android_webview/build/jarjar-rules.txt b/android_webview/build/jarjar-rules.txt
index 5f1231f0f5f2831d9d42d7d4e066874f20418c5c..dac27e0c239cfd1ce7c7103a140f9f6b8d326fd0 100644
--- a/android_webview/build/jarjar-rules.txt
+++ b/android_webview/build/jarjar-rules.txt
@@ -1,3 +1,7 @@
+zap org.chromium.ui.R**

[Torne, 2014/05/13 13:46:52]

Is a ** the right thing here? Isn't that going to zap/rename anything whose name
happens to start with an R in these packages? Do we maybe want an explicit rule
for R, and then a separate one for R.** instead?

[mkosiba (inactive), 2014/06/12 11:11:19]

Good point. The resources are inner classes so we need a rule for R and a
separate one for R$

+zap org.chromium.content.R**
+rule org.chromium.ui.R** com.android.org.chromium.R@1
+rule org.chromium.content.R** com.android.org.chromium.R@1
 rule org.chromium.** com.android.@0
 rule com.google.** com.android.org.chromium.@0
 rule com.googlecode.** com.android.org.chromium.@0