tree 8509f5b5ddd5b88000a443f49997da295fa4a33a
parent bea36e9aae8b591802bf081ca45d6625605bc773
parent 876b82ed1e0588da3c6770df80adfdac17d4ac5a
author Roozbeh Pournader <roozbeh@google.com> 1438746157 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438746157 +0000

am 876b82ed: am 37b18434: am 815a6b6b: am 519adb50: Merge "Create a special CONSTRAINED font bucket in frameworks." into mnc-dev

* commit '876b82ed1e0588da3c6770df80adfdac17d4ac5a':
  Create a special CONSTRAINED font bucket in frameworks.