am d7c097e4: (-s ours) am edbde709: (-s ours) Merge jb-mr1-dev into aosp/master - do not merge
* commit 'd7c097e46451641f99a21638786c5939ca82c557':
Manually update tradefed prebuilt from jb.
diff --git a/linux-x86_64/icu-4.8/gencnval b/linux-x86_64/icu-4.8/gencnval
deleted file mode 100755
index 846582b..0000000
--- a/linux-x86_64/icu-4.8/gencnval
+++ /dev/null
Binary files differ
diff --git a/linux-x86_64/icu-4.8/genrb b/linux-x86_64/icu-4.8/genrb
deleted file mode 100755
index e82d91a..0000000
--- a/linux-x86_64/icu-4.8/genrb
+++ /dev/null
Binary files differ
diff --git a/linux-x86_64/icu-4.8/icupkg b/linux-x86_64/icu-4.8/icupkg
deleted file mode 100755
index e76499f..0000000
--- a/linux-x86_64/icu-4.8/icupkg
+++ /dev/null
Binary files differ
diff --git a/linux-x86_64/icu-4.8/makeconv b/linux-x86_64/icu-4.8/makeconv
deleted file mode 100755
index 07fbad6..0000000
--- a/linux-x86_64/icu-4.8/makeconv
+++ /dev/null
Binary files differ
diff --git a/linux-x86_64/icu-49/gencnval b/linux-x86_64/icu-49/gencnval
new file mode 100755
index 0000000..256bdae
--- /dev/null
+++ b/linux-x86_64/icu-49/gencnval
Binary files differ
diff --git a/linux-x86_64/icu-49/genrb b/linux-x86_64/icu-49/genrb
new file mode 100755
index 0000000..abe5958
--- /dev/null
+++ b/linux-x86_64/icu-49/genrb
Binary files differ
diff --git a/linux-x86_64/icu-49/icupkg b/linux-x86_64/icu-49/icupkg
new file mode 100755
index 0000000..9be9504
--- /dev/null
+++ b/linux-x86_64/icu-49/icupkg
Binary files differ
diff --git a/linux-x86_64/icu-49/makeconv b/linux-x86_64/icu-49/makeconv
new file mode 100755
index 0000000..1e834ed
--- /dev/null
+++ b/linux-x86_64/icu-49/makeconv
Binary files differ
diff --git a/linux-x86_64/icu-4.8/readme.txt b/linux-x86_64/icu-49/readme.txt
similarity index 87%
rename from linux-x86_64/icu-4.8/readme.txt
rename to linux-x86_64/icu-49/readme.txt
index 6152249..000b99b 100644
--- a/linux-x86_64/icu-4.8/readme.txt
+++ b/linux-x86_64/icu-49/readme.txt
@@ -3,9 +3,9 @@
the Android build process. The tools can be
re-created using the following steps:
-(1) Copy the whole "/extlibs/icu-4.8"
+(1) Copy the whole "/extlibs/icu-49"
directory somewhere else. Please
- do not use a vanilla ICU 4.8 for
+ do not use a vanilla ICU 49 for
this, since the Android version
includes some patches for tweaking
file sizes.
