9fe80482a1adfd555ec60b563cd9b6641528d2e2 |
|
10-Jul-2014 |
Behdad Esfahbod <behdad@google.com> |
Merge remote-tracking branch 'aosp/upstream-mirror' into merge-upstream Update to upstream 5b4131eb1c670c20fd9a45a5617c64060a505ef5. Conflicts: Android.mk src/hb-unicode-private.hh Copied manually from harfbuzz-0.9.30.tar.bz2: src/hb-buffer-deserialize-json.hh src/hb-buffer-deserialize-text.hh src/hb-ot-shape-complex-indic-machine.hh src/hb-ot-shape-complex-myanmar-machine.hh src/hb-ot-shape-complex-sea-machine.hh src/hb-version.h Bug: 14954902 Change-Id: I5fac38d94b602c17efafa01bb3bfc572b15a2f21
|