tree e0bca55177fd50af848a10879a24cbbf17497e72
parent 340daf11ef2ecf7a6d69c865d7b59521ff5c203c
parent 83eeed92430fc3f14c21cfc43d11fcecef6e8285
author David Ng <dave@codeaurora.org> 1449716348 -0800
committer David Ng <dave@codeaurora.org> 1449716348 -0800
mergetag object 83eeed92430fc3f14c21cfc43d11fcecef6e8285
 type commit
 tag android-6.0.1_r3
 tagger The Android Open Source Project <initial-contribution@android.com> 1449526285 -0800
 
 Android 6.0.1 release 3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlZmBA0ACgkQ6K0/gZqxDniS/ACfbS1bIXPleHCBoQRVPPJpkHJc
 qgYAn1tiKVt7b5CDr/DhjeAqwuWkHLJ1
 =75Zr
 -----END PGP SIGNATURE-----

Merge tag 'android-6.0.1_r3' into 601r3

Android 6.0.1 release 3

* tag 'android-6.0.1_r3':
  emmc test: fix counter overflow
  64bit emmc fix

Change-Id: I9505f278f80aa1dde754c85a0977255376060cba