tree 1dbb552d888c0d348bd75b56b0b774163917200a
parent 32aec2d4550b136bffb4bbba6e3f4efa388d3534
parent b4d1951e7617983c8c615a04794445154de47eaa
author Divya Sharma <c_shard@codeaurora.org> 1446658341 -0800
committer Divya Sharma <c_shard@codeaurora.org> 1446658341 -0800
mergetag object b4d1951e7617983c8c615a04794445154de47eaa
 type commit
 tag android-6.0.0_r26
 tagger The Android Open Source Project <initial-contribution@android.com> 1446052355 -0700
 
 Android 6.0.0 release 26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlYxAgMACgkQ6K0/gZqxDnh95gCdHpOf1qFJZ+47GFVjMUjQvOqi
 uIUAoIgHzG+dozJht05agek5MhXQMGAn
 =I1ic
 -----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: Ib4b7942e5314b5d8cebcfc71880466dccb2c0fea