tree 3586c3f70dcbc58680b37137e98cf21860dbc69a
parent ace5aede4d581a2c33c3150c6fd85f5e54796897
parent 33ff268e48da69b73f3fea3bc3a7ff88fa2aed02
author Lucas Dupin <dupin@google.com> 1501626802 +0000
committer android-build-merger <android-build-merger@google.com> 1501626802 +0000

Merge "Fix issue where characters overlap" into oc-dr1-dev am: aa9807d5d4 am: 42057f9ef7
am: 33ff268e48

Change-Id: I27143cfe722e9f16908c1ff3cb9079e653dcdbd9