tree 8f26ebb86a0ca2214903fa2d4bcb5a49e3f350a1
parent 039e92f7cfe121ff0c7de757a3b2bbc82577e3a1
parent a2ffa43e112f0c81a42846b8cd4b53715f702c2f
author Divya Sharma <c_shard@codeaurora.org> 1446658612 -0800
committer Divya Sharma <c_shard@codeaurora.org> 1446658612 -0800
mergetag object a2ffa43e112f0c81a42846b8cd4b53715f702c2f
 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/gZqxDngdFACeLd9N03J7IZLU+dsziH53W/cj
 i4YAn10zJ4OJ6KVYNOQdx2AzC+y2/rP8
 =yLp+
 -----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: I3a7677a9ad13cba21feb966a9d2fa4b604de30d8