tree 6603771eff9364010d0059d458b2eace8a42f33c
parent 09eadbe846695eaa96beaadcc2cc86cb2cb64201
parent a6da7bf0be5f5e1c5da03596c3f83c54924ade50
author Fredrik Roubert <roubert@google.com> 1507200806 +0000
committer android-build-merger <android-build-merger@google.com> 1507200806 +0000

Integrate change cherry-picked for ticket #12986 into android_icu4j.
am: a6da7bf0be

Change-Id: I82eb858dfe6c402600ee8ec00ea78adcd5d980b2