tree 005ee3f6c55608e457392a2edc244c7373871502
parent ce09c54d61cb45ce6cf6aa9e10a5a9c170843a33
parent 3082585c72856e45dacb0610aa3591fa4d27ddf5
author Divya Sharma <c_shard@codeaurora.org> 1446658524 -0800
committer Divya Sharma <c_shard@codeaurora.org> 1446658524 -0800
mergetag object 3082585c72856e45dacb0610aa3591fa4d27ddf5
 type commit
 tag android-6.0.0_r26
 tagger The Android Open Source Project <initial-contribution@android.com> 1446052356 -0700
 
 Android 6.0.0 release 26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlYxAgQACgkQ6K0/gZqxDnjQBgCfTO1QCTo6kDg6ECOnRyBFkz4n
 b6sAn2ErfDxLOLhsmTn52GSP8iEyKFjx
 =K+to
 -----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
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE

Change-Id: I4ec0935f7158d30f7b97ba48cecb5b4637615d99