tree d61455ac24a39a6a2f2f486a44d46176f8cabf99
parent a5698f209dc9d79382233db011810f8e8f88c2c2
parent 4eaca1480bb1313200a32a1e6c3cfad5cb1bf415
author Divya Sharma <c_shard@codeaurora.org> 1446658522 -0800
committer Divya Sharma <c_shard@codeaurora.org> 1446658522 -0800
mergetag object 4eaca1480bb1313200a32a1e6c3cfad5cb1bf415
 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/gZqxDnibGgCfU/N8FZMJuJ8GNyMoLUzUfvql
 ZogAmQFM3CeDkzteXZQljGRqse7Fb49K
 =XHLw
 -----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

Change-Id: I2f3dcdc5a4dc4bdc58743b8f1683152903b986c0