tree 32972ff333aea7b8e578d9901d911affa6f59a5a
parent 8b4d2be5aa17dca32af452d4993cc026987b2386
parent 99f1ed7133f5f7ac01f3db05410e8e6f93678003
author Divya Sharma <c_shard@codeaurora.org> 1446658490 -0800
committer Divya Sharma <c_shard@codeaurora.org> 1446658490 -0800
mergetag object 99f1ed7133f5f7ac01f3db05410e8e6f93678003
 type commit
 tag android-6.0.0_r26
 tagger The Android Open Source Project <initial-contribution@android.com> 1446052356 -0700
 
 Android 6.0.0 release 26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlYxAgQACgkQ6K0/gZqxDnjn7wCcCC8hHwzmhTIfB4MfcqGXk6zB
 75MAnjqaDBye5uaErMvLwcd8FnqNWKiA
 =XsKV
 -----END PGP SIGNATURE-----

Merge tag 'android-6.0.0_r26' into HEAD

Android 6.0.0 release 26

* tag 'android-6.0.0_r26':
  Fixed that "Turn on notification" does not work.
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Fixed the incorrect audio duration used for ETWS messages.
  Make CMAS monthly test messages additional language enabled for all SIMs.
  Always show "Turn on Notification" for some carriers.
  Added CMAS monthly test additional language messages support.
  Fixed that severe CMAS messages were not disabled.
  Import translations. DO NOT MERGE

Change-Id: Ieb1e2122bf15b1712910a8c7ef73e98f4699c355