tree c54bfe5a5234b6a49ee5a93c2cface1e5645b50f
parent cd4e4051c2710882616009ebc779b1ae0cec697b
parent 8a84c19a41ea34e0bd1f098cad755e71edd97c61
author Divya Sharma <c_shard@codeaurora.org> 1446658449 -0800
committer Divya Sharma <c_shard@codeaurora.org> 1446658449 -0800
mergetag object 8a84c19a41ea34e0bd1f098cad755e71edd97c61
 type commit
 tag android-6.0.0_r26
 tagger The Android Open Source Project <initial-contribution@android.com> 1446052355 -0700
 
 Android 6.0.0 release 26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlYxAgMACgkQ6K0/gZqxDnhQ/ACeObXC+3gSKNauzI8VOdzlfVSB
 SrAAni+EMKPsUEw0NFXOI5z8vCsrIlS9
 =Djx2
 -----END PGP SIGNATURE-----

Merge tag 'android-6.0.0_r26' into HEAD

Android 6.0.0 release 26

* tag 'android-6.0.0_r26':
  Define the data parameter for POWER_HINT_INTERACTION.
  HWC: Add a color transform attribute per display

Change-Id: I3fd29a6d734563532c7061246488f4c3d274b87a