am ee144b1e: resolved conflicts for bd57dac5 to stage-aosp-master

* commit 'ee144b1e60a88e8f097113e046813f0b61c38b9b':
  Don't unregister Fonts from renderer at destruction
tree: e2672ca547a68f4d9dff978e68de3e2fafbbc64e
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. wrap_alpha.py