OSDN Git Service

am de7d268e: am e32d00aa: (-s ours) am 519adb50: Merge "Create a special CONSTRAINED...
authorRoozbeh Pournader <roozbeh@google.com>
Thu, 27 Aug 2015 19:27:58 +0000 (19:27 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 19:27:58 +0000 (19:27 +0000)
commit75738d12c8a438326db9765e4c5aef47fecee485
tree536fdbb678025efa3d0a9086d5032cd8687dc1b1
parentd49ce826350989e2f11193d16af5bfa3024bff34
parentde7d268eadd7d1397567ce147f076ea9e16fdc92
am de7d268e: am e32d00aa: (-s ours) am 519adb50: Merge "Create a special CONSTRAINED font bucket in frameworks." into mnc-dev

* commit 'de7d268eadd7d1397567ce147f076ea9e16fdc92':