tree 7aea85a92dc5fd0cfe22a519d5c675d4ea1f6078
parent b970e426a03d3544c384a99616ec52a672643215
parent f8ae1af373c4d80c9ad201aa7dac46da5a75e411
author Divya Sharma <c_shard@codeaurora.org> 1446657767 -0800
committer Divya Sharma <c_shard@codeaurora.org> 1446657767 -0800
mergetag object f8ae1af373c4d80c9ad201aa7dac46da5a75e411
 type commit
 tag android-6.0.0_r26
 tagger The Android Open Source Project <initial-contribution@android.com> 1446052345 -0700
 
 Android 6.0.0 release 26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlYxAfkACgkQ6K0/gZqxDnjdHwCfXULeYPA43MWuy/x5TeOh2SOg
 slwAmQHG1W+tNUmTjpud6EVKgWKxeKbj
 =JX7Z
 -----END PGP SIGNATURE-----

Merge tag 'android-6.0.0_r26' into HEAD

Android 6.0.0 release 26

* tag 'android-6.0.0_r26':

Change-Id: I9a999fcb4e0e0626a664f83b5aae2e2d48262b57