tree d677cc606b9701f27fcd230230a103689207a099
parent 7e4851ff7e0ece777432d3579de82bf24a91f08d
parent 096a45a67ca693804beca3aa50a1e9975afbe46d
author Divya Sharma <c_shard@codeaurora.org> 1446658487 -0800
committer Divya Sharma <c_shard@codeaurora.org> 1446658487 -0800
mergetag object 096a45a67ca693804beca3aa50a1e9975afbe46d
 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/gZqxDnhehwCdE6nCBT5Px91dSSHip4mRMmI6
 FfcAninsCm1TvaS3jz9J7RBtxxnEdhu0
 =vVk3
 -----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
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE

Change-Id: Ib227ca238fdf925a29275c14c3642c2171b83f99