tree 9d5010ea8e68501e023e8dfe4fc4f7c69c582073
parent 3f449fd714a8f7a5f7b061f406192d6629624066
parent 04d23e6526745822df2e62d78160fdcb1bd0a2e6
author David Ng <dave@codeaurora.org> 1449709307 -0800
committer David Ng <dave@codeaurora.org> 1449709307 -0800
mergetag object 04d23e6526745822df2e62d78160fdcb1bd0a2e6
 type commit
 tag android-6.0.1_r3
 tagger The Android Open Source Project <initial-contribution@android.com> 1449526275 -0800
 
 Android 6.0.1 release 3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlZmBAMACgkQ6K0/gZqxDnjuOQCgkL++qE4yfOz0907/Ylyva3XQ
 RY4AoJJdw7PBiCnwUVL75iVhCpOcgWPA
 =xJfE
 -----END PGP SIGNATURE-----

Merge tag 'android-6.0.1_r3' into 601r3

Android 6.0.1 release 3

* tag 'android-6.0.1_r3': (61 commits)
  DO NOT MERGE ANYWHERE: bumping CTS 5.1 to R4
  DO NOT MERGE: Add FEATURE_CAMERA_EXTERNAL to front-facing camera condition
  Add FEATURE_CAMERA_EXTERNAL to front-facing camera condition
  DO NOT MERGE: Fix ION memory leak for camera2 testStillPreviewCombination tstcase
  DO NOT MERGE: Camera: add testAllOutputYUVResolutions back to known failure
  Increase wait timeout for ContextWrapperTest
  Change CTS verifier HifiUltrasound Tests text to be consistent with CDD text
  CTS: DO tests for DISALLOW_CONFIG_VPN
  Fix CameraManagerTest logic.
  cts: Skip encodeDecode tests when there is no needed encoder
  Stop android.print tests from executing if the device does not support print.
  DO NOT MERGE Add running time hints to CTS package config
  CameraITS: use linear tonemap in test_exposure
  TIF: Make sure that Cursor.moveToNext() is called before using Cursor
  DO NOT MERGE: Adding testConnectivityConstraintExecutes_withMobile to knownfailure list.
  Adding testConnectivityConstraintExecutes_withMobile to knownfailure list.
  DO NOT MERGE CTS version is now 6.0_r1.5
  AudioRecordTest: Remove assert check on cold input start time
  Stop android.print tests from executing if the device does not support print.
  Restrict telephony.cts.CellInfoTest to Devices with FEATURE_TELEPHONY
  ...

Change-Id: I8d670f35346bc28ec4176ae8b20ca8dc3a0d823a