tree cb2974275b2a627b4cd17c4d661c47f599b7537d
parent 58712cc85667a30dbdaf8fffc3c05b7e62486a22
parent 708589163e790eb3a7fec09f4832a0f78999bdf3
author Divya Sharma <c_shard@codeaurora.org> 1446658640 -0800
committer Divya Sharma <c_shard@codeaurora.org> 1446658640 -0800
mergetag object 708589163e790eb3a7fec09f4832a0f78999bdf3
 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/gZqxDngNMgCfTiSxqTn9AteWb8mDkJysfv5A
 a38An0u2/fnRPp8PgB4Fimir44xEaGB3
 =48ad
 -----END PGP SIGNATURE-----

Merge tag 'android-6.0.0_r26' into HEAD

Android 6.0.0 release 26

* tag 'android-6.0.0_r26':
  TestingCamera1/2: Disable dex preopt

Change-Id: I79fb35d8b16b905408c1c7b0f35cf6ec230fe309