tree 7f18c8c5b3b278e59d8e9cd392b15571fc85c1e2
parent 54cffc7fa5af40cf5abca2430d7baab850d6df6f
parent fdccac1eddd8577b0e728cd8e0fb219676b4ed54
author Divya Sharma <c_shard@codeaurora.org> 1446658570 -0800
committer Divya Sharma <c_shard@codeaurora.org> 1446658570 -0800
mergetag object fdccac1eddd8577b0e728cd8e0fb219676b4ed54
 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/gZqxDni7lACfSyiT2uRwsfcXxhn0JEWQ0uOc
 vtcAoJJ+N/bm5XicQRsaT0oUDZElZXZ+
 =VxuK
 -----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
  Import translations. DO NOT MERGE

Change-Id: If7e73312fa8efe1e23e04cf8f7769c0d79ba4edd