tree 2453a2cad31cbf378ac6884a8db96c3c88443aed
parent dc0c52f4f592f6b9731939f0031e977a70515d4a
parent 00fabcbeb035fb513293ea01d245002f40b3234f
author Chris Craik <ccraik@android.com> 1400527958 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400527958 +0000

am 00fabcbe: am b1708e9b: Merge "Use alpha channel instead of red in drawCachedGlyphBitmap"

* commit '00fabcbeb035fb513293ea01d245002f40b3234f':
  Use alpha channel instead of red in drawCachedGlyphBitmap