tree f33dc88b55a8faf753655cfaa190597854c24e78
parent db23481568f77c981d1d8b7fe7abbe6f515dfabd
parent 02aa1bb4e079d9fb9b210f39560bfccccf39f36d
author Divya Sharma <c_shard@codeaurora.org> 1446658672 -0800
committer Divya Sharma <c_shard@codeaurora.org> 1446658672 -0800
mergetag object 02aa1bb4e079d9fb9b210f39560bfccccf39f36d
 type commit
 tag android-6.0.0_r26
 tagger The Android Open Source Project <initial-contribution@android.com> 1446052358 -0700
 
 Android 6.0.0 release 26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlYxAgYACgkQ6K0/gZqxDnioqwCfYALlTA+NcCMkmQEq6OnOvZAO
 IEsAn2siYNMNZoQ8f4QGujGQQlOZlb2V
 =INJb
 -----END PGP SIGNATURE-----

Merge tag 'android-6.0.0_r26' into HEAD

Android 6.0.0 release 26

* tag 'android-6.0.0_r26':
  Updated prebuilts to ATSL 4.1 release
  Version 4.0 Testing Support Library
  Version 23.0.1 of the support libraries
  Version 23.0.0 of the support libs.

Change-Id: Ic81c8aaf77e81d25f049c3160e465b4e34c29b4b