Merge "Replace JNI portion of AndroidBidi with calls to ICU4J"

author Roozbeh Pournader <roozbeh@google.com>

Thu, 19 Oct 2017 22:55:57 +0000 (22:55 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Thu, 19 Oct 2017 22:55:57 +0000 (22:55 +0000)
author Roozbeh Pournader <roozbeh@google.com>
Thu, 19 Oct 2017 22:55:57 +0000 (22:55 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 19 Oct 2017 22:55:57 +0000 (22:55 +0000)
diff --cc core/jni/Android.bp
Simple merge
diff --cc core/jni/AndroidRuntime.cpp
Simple merge
author	Roozbeh Pournader <roozbeh@google.com>
	Thu, 19 Oct 2017 22:55:57 +0000 (22:55 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 19 Oct 2017 22:55:57 +0000 (22:55 +0000)
		1	2
core/jni/Android.bp	patch \|	diff1 \|	diff2 \|	blob \| history
core/jni/AndroidRuntime.cpp	patch \|	diff1 \|	diff2 \|	blob \| history