tree fccd88a37190108bc96703316993267b10c5ccc3
parent e3da350284412a8aa24dc4fe0133fd61f32baee5
parent ba170abed62371f26b3b1b7255ff1631d69bb964
author Divya Sharma <c_shard@codeaurora.org> 1446658614 -0800
committer Divya Sharma <c_shard@codeaurora.org> 1446658614 -0800
mergetag object ba170abed62371f26b3b1b7255ff1631d69bb964
 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/gZqxDnhauwCeMmzYIaSADIxRQP+/jeHlyCao
 /doAnjclZSEXBFD07WNgUerE/El6bmeC
 =Xnda
 -----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: I9547f33e03b70ad20353b45d72b6bcf46db2e3d7