tree f5c89c24dfb1cf41e31d4c5f9cd4c1dd28cc7232
parent c9e6f08e591b76490c465a7ebbdbb72159bfa8af
parent fab9ee32088a966773aae14ec368e731113da5a2
author Divya Sharma <c_shard@codeaurora.org> 1446658470 -0800
committer Divya Sharma <c_shard@codeaurora.org> 1446658470 -0800
mergetag object fab9ee32088a966773aae14ec368e731113da5a2
 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/gZqxDni7XACaAxHmunc4EI4Uk1dBW4NRrVCI
 z/UAn20ffcQMxZKj5WW1apkFih9erJ92
 =Uoyi
 -----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: I0c40fbcd408e9fefdc3b79f9f6f3e7a9c595169f