tree 40c632ed1be95cc07c68e1c57171a3260e48919d
parent c4cbe89564fda7f456ef61417f296e0becf8d081
parent 3ac1650526abf4dc7786f0f12070ddbfd545e7dc
author Chris Banes <chrisbanes@google.com> 1485319246 +0000
committer android-build-merger <android-build-merger@google.com> 1485319246 +0000

Merge "Fix hasGlyph() for pre-v23" into nyc-support-25.2-dev
am: 3ac1650526

Change-Id: I75d07a00e1f4a5d9b78060fac145eebcf598c82a