tree 8055c27231d935779d28b449fbfc24510f722699
parent 751b01e30ab091f79484edbfbb3589d4093ec6ee
parent 09c3547a257de63a2666d160740cc506dd8f75ce
author Divya Sharma <c_shard@codeaurora.org> 1446658631 -0800
committer Divya Sharma <c_shard@codeaurora.org> 1446658631 -0800
mergetag object 09c3547a257de63a2666d160740cc506dd8f75ce
 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/gZqxDnh9kACeMSxGO81eNMaF2vzu7CcZbrae
 lMEAn1ji2NHOvHZcQRxCvF4TMUD9uwLB
 =iCSP
 -----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: I3d651ec07e26ac6adca7ef9b375b2a3c5bb6fc6e