tree 58896b01fd24b83334ef586bb80c073b4481aecc
parent c2103f4ca4c61bfc426805d5584fd9d8f30e8df9
parent cf8d9876dbe06089b7e99b56542b4f42b4247a9b
author Sridhar Gujje <sgujje@codeaurora.org> 1449656741 +0530
committer Sridhar Gujje <sgujje@codeaurora.org> 1449656741 +0530
mergetag object cf8d9876dbe06089b7e99b56542b4f42b4247a9b
 type commit
 tag android-6.0.0_r26
 tagger The Android Open Source Project <initial-contribution@android.com> 1446052340 -0700
 
 Android 6.0.0 release 26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlYxAfQACgkQ6K0/gZqxDnht/QCfQ5orR0L/e8n7xL989M4T/6r/
 z0AAn2NOwP1GQ5QI4ztzMQ8fN3jlxQ/c
 =eo1J
 -----END PGP SIGNATURE-----

Merge tag 'android-6.0.0_r26' into HEAD

Android 6.0.0 release 26
* tag 'android-6.0.0_r26':
  Switch runtime permission samples to AppCompat theme.

Change-Id: I1b85cba76c13b5b7f8c946a86a9cfb9223727850