tree d2a9b456e79f0e0b3ae6a76c9824eb2a6addd779
parent 97231c1c9cee834a614879935ca419582a0ac360
parent aa9807d5d42810f04c7ae8fd9cd5d0201701f637
author Lucas Dupin <dupin@google.com> 1501625117 +0000
committer android-build-merger <android-build-merger@google.com> 1501625117 +0000

Merge "Fix issue where characters overlap" into oc-dr1-dev
am: aa9807d5d4

Change-Id: Ia4d2775d924d006d8c7fa7b2a8f02f8bd852b688