tree e15c894dc5c443affb2ee37ca6db5d4367e3395f
parent daf2fd85ca46a2e7f69b1b6581f5207b67230554
parent 708c75e9916dd4f9aee4cc2dd38da8c1e26d3ad2
author Divya Sharma <c_shard@codeaurora.org> 1446657960 -0800
committer Divya Sharma <c_shard@codeaurora.org> 1446657960 -0800
mergetag object 708c75e9916dd4f9aee4cc2dd38da8c1e26d3ad2
 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/gZqxDnhYAQCfb47bSGRrtg76Fovmex4IJYNU
 wvEAn0HuDg0RJpAmtbknUlk/+wc0s4Qr
 =dTlG
 -----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 noto-fonts."

Change-Id: I8cd9e22a2f845814b189f0a0c83404abcdb6526c