tree 638dffc993d5540d45d1831eb1a0c05a9ea3be3c
parent 96cf989ae48f6f4383b9c76a9d29205363aba8cc
parent 3315c12c2ece901185f3df833ad055f261b47a1e
author Divya Sharma <c_shard@codeaurora.org> 1446658127 -0800
committer Divya Sharma <c_shard@codeaurora.org> 1446658127 -0800
mergetag object 3315c12c2ece901185f3df833ad055f261b47a1e
 type commit
 tag android-6.0.0_r26
 tagger The Android Open Source Project <initial-contribution@android.com> 1446052354 -0700
 
 Android 6.0.0 release 26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlYxAgIACgkQ6K0/gZqxDnhivQCeL60+l+CILGJCwvepc75FwAM0
 wpUAn1c+lG9cDYRMjLpDvUkQ7mCMm5SC
 =213y
 -----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: I5902c0196fdf7c5c775ab841bb99104a78d1905e