tree 0b69d8c76d559ccf7b6c3ae210b5fdadba4c9812
parent f5766c04c3c23711f7cbfaebf75d210924013b97
parent ae4f6218f9cdc96eb3583d4b9c86c2b519976ace
author Divya Sharma <c_shard@codeaurora.org> 1446658478 -0800
committer Divya Sharma <c_shard@codeaurora.org> 1446658478 -0800
mergetag object ae4f6218f9cdc96eb3583d4b9c86c2b519976ace
 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/gZqxDnh8qgCdH7IasZ+puhLByYas+cxHQOjQ
 VJAAn3DXFCbPYljrI7c4eGn+4p+FekC0
 =wnyQ
 -----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: I1051c112f2e9a1860dfcde2b5f5531d1f22eaac4