tree 06e21d7f0b6d605f0b5884c7aac3b844bbd1b564
parent e565e090674d4fc485d988114459609680be7016
parent aa9807d5d42810f04c7ae8fd9cd5d0201701f637
author Lucas Dupin <dupin@google.com> 1501625118 +0000
committer android-build-merger <android-build-merger@google.com> 1501625118 +0000

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

Change-Id: I4a2dbe98638b9d51b6e7ad3658662a3f29267e29