tree 55da2163b8bde925bc942b33d28d45c32a58c365
parent d4c2401409c76c894b4b1c832eb19e8b880aaa2f
parent 3ad5c9d5a53649ad7fbd3b55cdcfef0e6036e56a
author Fredrik Roubert <roubert@google.com> 1491320660 +0000
committer android-build-merger <android-build-merger@google.com> 1491320660 +0000

Integrate change cherry-picked for ticket #12410 into android_icu4j.
am: 3ad5c9d5a5

Change-Id: Ic65afe7f1ff440ff1f832a89c0d362eee48df3fe