tree 81ce4675e7bfb349c426cad756add14785c0e78e
parent 7346613f27a6c52aa19cf8169ccd63b7075a2b1c
parent 21a5edcc24cbca1ae3f0855d71737b22ab81ad6d
author Roozbeh Pournader <roozbeh@google.com> 1491179262 +0000
committer android-build-merger <android-build-merger@google.com> 1491179262 +0000

Merge "Override bidi property of new emojis" into oc-dev
am: 21a5edcc24

Change-Id: Ie37451b8234f1e5c06bb20f1c26e8f832006f3e3