tree 128a35961d51de25db7072536a608195b82e20cf
parent fe0bf1fbbba83e8906c3062184fe4d1dd04eac8e
parent f2ab5fedbce1c3ae0400ea79468f17d943146770
author Divya Sharma <c_shard@codeaurora.org> 1446658638 -0800
committer Divya Sharma <c_shard@codeaurora.org> 1446658638 -0800
mergetag object f2ab5fedbce1c3ae0400ea79468f17d943146770
 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/gZqxDnhqWwCfchVpNLMC+GSeMJRB7XIAA+aQ
 nQkAnibIJCujZbZXUZL3UeQ+rtEdOtmg
 =HpUM
 -----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: I9cd1a04a0305bc1de581fceb311f607b87a58a2c