tree d32dcf012d5b93a394abdcd54b12848b013a6b8a
parent a5361f57a0dd501a28345a393a5df36b3a2d4905
parent 5ecfed31d5b3fbcde85c266562b8c4a7c2195436
author Divya Sharma <c_shard@codeaurora.org> 1446658636 -0800
committer Divya Sharma <c_shard@codeaurora.org> 1446658636 -0800
mergetag object 5ecfed31d5b3fbcde85c266562b8c4a7c2195436
 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/gZqxDngCpgCbB0DhpeHI+FrGfn+t/FE7GEiY
 INcAn2E96NtlKRR51vgV9TXRcNfow6NB
 =9NlY
 -----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

Change-Id: I41773739f5ea8048b1242f528a40af401d1780dc