tree d362d77a0844a30ded073530c024a28e8b41dcf3
parent 6aa95735768b19e419008522833c2a2786dfd96d
parent 4b1ec214ee15c85009bc65ceb738e3e1c7f37432
author Divya Sharma <c_shard@codeaurora.org> 1446657686 -0800
committer Divya Sharma <c_shard@codeaurora.org> 1446657686 -0800
mergetag object 4b1ec214ee15c85009bc65ceb738e3e1c7f37432
 type commit
 tag android-6.0.0_r26
 tagger The Android Open Source Project <initial-contribution@android.com> 1446052344 -0700
 
 Android 6.0.0 release 26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlYxAfgACgkQ6K0/gZqxDnjTsgCfex5cYaEY5F/f8W+y6VI4NtiH
 f9MAn14PsVIEBRYfNnDHZN2Q+2KZ+g1m
 =Kf0I
 -----END PGP SIGNATURE-----

Merge tag 'android-6.0.0_r26' into HEAD

Android 6.0.0 release 26

* tag 'android-6.0.0_r26': (71 commits)
  CDD: Add BASE_OS and SECURITY_PATCH build parameters
  CDD: Add android.hardware.type.automotive feature for Automotive
  CDD: Requirement updates for the assistant
  CDD: Add adoptable storage section
  Standardize use of STRONGLY RECOMMENDED
  CDD: Add devices must be able to decode all formats it can encode to Mulitmedia (formerly change 787297)
  Use STRONGLY RECOMMENDED for reporting supported audio features
  CDD: Clarify TV app requirements for devices with TV input Framework support.
  CDD: Updates to changelog, TOC fix
  Docs: Adding new cover image and current date
  CDD: Add Data Deletion section
  CDD: Add requirements for the new HiFi sensor feature
  Fix mis-matched tags
  CDD: Add requirements for the Android Keystore System
  CDD: Clarify SELinux CDD requirements.
  CDD: Require rotation vector when accel, gyro, magneto available
  CDD: Update requirements for new density buckets
  CDD: Add requirements related to the new fingerprint API
  Docs: Changelog additions for M version merges as of 10-15-2015
  Docs: Fixing plural carriers ref
  ...

Change-Id: I5c2546dba78d06423f42507c1682d005599a984c