tree 4225d4705d8e4fae3e4c6edb38d3367b6ec99481
parent e879d165039e1c1e328c5d2c1f84f4f25e01bea0
parent 6810e940e1213a997ebbc1d1a5ab59ba7f4c001e
author Divya Sharma <c_shard@codeaurora.org> 1446657947 -0800
committer Divya Sharma <c_shard@codeaurora.org> 1446657947 -0800
mergetag object 6810e940e1213a997ebbc1d1a5ab59ba7f4c001e
 type commit
 tag android-6.0.0_r26
 tagger The Android Open Source Project <initial-contribution@android.com> 1446052348 -0700
 
 Android 6.0.0 release 26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlYxAfwACgkQ6K0/gZqxDnjPtACeNKinbWQpKcBGdVqHn4DeZ786
 HHUAn1adsTrTVGJTjL19Y3muerEZIdiK
 =MsgK
 -----END PGP SIGNATURE-----

Merge tag 'android-6.0.0_r26' into HEAD

Android 6.0.0 release 26

* tag 'android-6.0.0_r26':
  Revert "Create a special CONSTRAINED font bucket in naver-fonts."

Change-Id: Id812cc4b22172c02d28ae26147a6f132016dfdab