tree 2a25f6f7ffc3608e29da00d017f606a8bc115316
parent c60a5d781a5e9f927d5971f2127cada9d213a128
parent c08b47a7acf0192bb24d7d189345840f1c5258cc
author Roozbeh Pournader <roozbeh@google.com> 1416954778 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416954778 +0000

am c08b47a7: Merge "Add Lohit Odia (Oriya) font to the fallback chain." into lmp-mr1-dev

* commit 'c08b47a7acf0192bb24d7d189345840f1c5258cc':
  Add Lohit Odia (Oriya) font to the fallback chain.