tree cd2d2ad664fb8ba7ba20f8af77a7d7e1ff854548
parent acaf0ecb840b996d2bbafee09759507bc196414f
parent f036f26225f774f2ae67070721ec5b043e34b512
author Divya Sharma <c_shard@codeaurora.org> 1446658511 -0800
committer Divya Sharma <c_shard@codeaurora.org> 1446658511 -0800
mergetag object f036f26225f774f2ae67070721ec5b043e34b512
 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/gZqxDnhkXACeNtE+UymqCi08/D1I+Ft2Wr/F
 losAn3zK2iPWzIKTVuqoHXmqnoVOBeP8
 =FJgA
 -----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

Change-Id: I0e44a0bb8e352f2d37d1ee9d12157dfb1adb42df