tree 0251e0222cc8c981d3d644a7b7d8a5274b7ef0d0
parent 1152b39032a3ab686d41ed282ee4e42c8dd3769d
parent d3da46fdc0f8fc21d059dbf4907b26dfaa277fc9
author Victor Chang <vichang@google.com> 1539642199 -0700
committer android-build-merger <android-build-merger@google.com> 1539642199 -0700

[automerger skipped] DO NOT MERGE Cherry-pick: ticket:13766: Make UnicodeMapTest#TestUnicodeMapGeneralCategory smaller.
am: d3da46fdc0  -s ours

Change-Id: I0c0bf50883352d055b5195f2cdd7a0c3be05fe83