tree 5055d17d72160998620fc3c7c4489cacf02d364c
parent 6a694a1bad8bf2e1a586dcc6767a6bead3987a93
parent 8e773d9ee3880b989e2d55d9e3cab3a3fbe8b396
author Divya Sharma <c_shard@codeaurora.org> 1446658512 -0800
committer Divya Sharma <c_shard@codeaurora.org> 1446658512 -0800
mergetag object 8e773d9ee3880b989e2d55d9e3cab3a3fbe8b396
 type commit
 tag android-6.0.0_r26
 tagger The Android Open Source Project <initial-contribution@android.com> 1446052356 -0700
 
 Android 6.0.0 release 26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlYxAgQACgkQ6K0/gZqxDngp1ACfT1Jc5Ll/qbGyjzQxv/tihlh9
 RMYAn0xoePef4zsUGs9sQ4otH+VH42HM
 =23yQ
 -----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: Ia8a89e995c79b3bf874e40b6128d1b37985f558c