tree 3647b2fd48db97a042a05e3759152943aea98484
parent bb3a3312c982ed5cad3a4533771d74356b65f98f
parent 9ef49eca8122fd8c8933eea1a7d5d489318b6b03
author Divya Sharma <c_shard@codeaurora.org> 1446658633 -0800
committer Divya Sharma <c_shard@codeaurora.org> 1446658633 -0800
mergetag object 9ef49eca8122fd8c8933eea1a7d5d489318b6b03
 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/gZqxDnixZACfQwVVEe8MM8b6A3QSbYEGNHpd
 3/sAnRB71k2QPoIAOG0IXAzXU/32tAwE
 =HI4r
 -----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: I0f9ed204cafe7dc86043168074231e706191c945