tree 7d1d00095f8fabe1172bb73a3c473acaa43aac29
parent 15744cf2bbd082c27b546e9046618dd92c3591b6
parent a0df0f4b2664319539128dee1f36a72872debdbe
author Divya Sharma <c_shard@codeaurora.org> 1446658673 -0800
committer Divya Sharma <c_shard@codeaurora.org> 1446658673 -0800
mergetag object a0df0f4b2664319539128dee1f36a72872debdbe
 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/gZqxDniW+QCePMcpltSuDlLE59Kq0ESFV3UQ
 NPYAnj7CkM8L9hxtupsuvYAtI5lKoFEr
 =0jQc
 -----END PGP SIGNATURE-----

Merge tag 'android-6.0.0_r26' into HEAD

Android 6.0.0 release 26

* tag 'android-6.0.0_r26':
  update jank test helper
  update tradefed prebuilt for CTS runner
  Create a version of the annotations prebuilt that can be used as a dependency [DO NOT MERGE]
  Update tools-common prebuilts. [DO NOT MERGE]
  Update sdk-common prebuilt. [DO NOT MERGE]
  Update layoutlib_api-prebuilt from 1.3 RC4. [DO NOT MERGE]
  vboot_signer: Fix issues with keyblock

Change-Id: I58e2cbcd84cf1160fd8d8484c16da2625c36bd59