tree 8fc72ef9d8384091c574510d2376e31d026845f9
parent 62fc3c2adc07fcc6adaa3d407b2c9e837091609e
parent 5d53c06967da74189935063f7a75da6719a9c733
author David Ng <dave@codeaurora.org> 1449709830 -0800
committer David Ng <dave@codeaurora.org> 1449709830 -0800
mergetag object 5d53c06967da74189935063f7a75da6719a9c733
 type commit
 tag android-6.0.1_r3
 tagger The Android Open Source Project <initial-contribution@android.com> 1449526278 -0800
 
 Android 6.0.1 release 3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlZmBAYACgkQ6K0/gZqxDngCmgCeNqKyPyEHEqBOgdSx+F5jvp5l
 3ukAn3rqnsfJQ4BB/uyei2J8VzKUfeea
 =0Tre
 -----END PGP SIGNATURE-----

Merge tag 'android-6.0.1_r3' into 601r3

Android 6.0.1 release 3

* tag 'android-6.0.1_r3':
  Avoid a harmless potential integer overflow in png_XYZ_from_xy().

Change-Id: Ie98d8fc97398fe54fbfef5a2533a0e99007126ef