tree 86d9f041a2ce4400240901318bce8b4655c65751
parent 47b1142478503a80b89a4e724b0c12af60d9cc1f
parent b15d7ade80fd69fb2fb7de61abfd9f1afce91c44
author Divya Sharma <c_shard@codeaurora.org> 1446658690 -0800
committer Divya Sharma <c_shard@codeaurora.org> 1446658690 -0800
mergetag object b15d7ade80fd69fb2fb7de61abfd9f1afce91c44
 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/gZqxDnhODwCdFIZbEUJa7nmCPAmyG/YDfPDQ
 vy8AoI/FMLhxqJBJwLG1Ahxx8vC+27LQ
 =JCoF
 -----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 api-generator prebuilt

Change-Id: I7ae32d863d6826da95d938a6f7a2920bde0b52e8