tree f21b7ee0ae24154c5c73a137946df59ffb0649ad
parent 647b6e45bdd938b0ac5a0a452eabad057c8d8955
parent 43b154a71bb6cd7886cc7a6908a4ae0012bdf163
author Divya Sharma <c_shard@codeaurora.org> 1446658123 -0800
committer Divya Sharma <c_shard@codeaurora.org> 1446658123 -0800
mergetag object 43b154a71bb6cd7886cc7a6908a4ae0012bdf163
 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/gZqxDnjZFgCfdjHp1v3S4syZ3HogKSS3y63e
 6T8AniuYe4COoNSTc11IvRGaN4lXLn14
 =hSsQ
 -----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: Iaf9d28756be61937afa91b264d08247d13c4c688