tree 0a6f4f69579795b36728d5637d4d529771813db2
parent d28d000684290009b3b615a6ac7fd9a858744fa0
parent 2f0660b447f6dc4d0048450f5198c2345422e46b
author Divya Sharma <c_shard@codeaurora.org> 1446658628 -0800
committer Divya Sharma <c_shard@codeaurora.org> 1446658628 -0800
mergetag object 2f0660b447f6dc4d0048450f5198c2345422e46b
 type commit
 tag android-6.0.0_r26
 tagger The Android Open Source Project <initial-contribution@android.com> 1446052357 -0700
 
 Android 6.0.0 release 26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlYxAgUACgkQ6K0/gZqxDniQEwCfXnzd6rJskRF/tGG3GquFaRTQ
 jaUAoIfFPyV/6u7c/fWkVZryyiObbqvj
 =olsP
 -----END PGP SIGNATURE-----

Merge tag 'android-6.0.0_r26' into HEAD

Android 6.0.0 release 26

* tag 'android-6.0.0_r26':
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE

Change-Id: Ife4b8336194f6dce7e8567db1e09ad3896d89c33