tree 872905d616dea8210443931fc088713dcfb6f9c9
parent ef25f7b9c30c336a897910d8da7b218742a91252
parent 5826cfe57a25c3aa732d7f3bfdb6f418f7c20101
author Divya Sharma <c_shard@codeaurora.org> 1446658531 -0800
committer Divya Sharma <c_shard@codeaurora.org> 1446658531 -0800
mergetag object 5826cfe57a25c3aa732d7f3bfdb6f418f7c20101
 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/gZqxDniQZwCeNlQCSvuKeHgOSlRUpV8eAsLm
 uk8An3eZLkJ7RDzNHVxgvzCaeiKMpaFb
 =9m7N
 -----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: Ia9bff9db1e5371da310dacd01f2ff85f398be4c5