commit ee235414493f963dcbbf7d4f87f725055315d442
author The Android Automerger <android-build@google.com> Thu Dec 10 10:37:14 2015 -0800
committer android-build-merger <android-build-merger@google.com> Thu Dec 10 10:37:14 2015 -0800
tree e9925efeefd9914f43c9a06b902cf503cf82f332
parent abe587984adc0fbc1e7487b69b5b45de929c7d9d
parent 78df332ef1a6be3cda40b776a6321425fa829ddb

merge in lmp-mr1-cts-release history after reset to lmp-mr1-dev
am: 78df332ef1

* commit '78df332ef1a6be3cda40b776a6321425fa829ddb': (32 commits)
  cts: get video size from CamcorderProfile -- DO NOT MERGE
  BUG: 23792027 adding android.hardware.cts.helpers.sensorverification.EventOrderingVerificationTest#testSameTimestamp to knownfailure
  cts: get video size from CamcorderProfile -- DO NOT MERGE
  cts: get video size from CamcorderProfile -- DO NOT MERGE
  BUG: 23954202 fixed minimum memory to be 1099
  DO NOT MERGE ANYWHERE: fix breakage
  DO NOT MERGE: fix breakage
  rename android_security_cts_AudioflingerBinderTest.cpp to android_security_cts_AudioFlingerBinderTest.cpp
  Test if libstagefright dies in onInputBufferFilled on currupted file
  Should return true if the specified file doesn't exist
  DO NOT MERGE - Revert "Revert "Fix AudioTrackTest.testGetTimestamp""
  DO NOT MERGE ANYWHERE:revert and resubmit on lmp-dev
  DO NOT MERGE ANYWHERE:revert and resubmit to lmp-* branches
  Fix build error in ExtractDecodeEditEncodeMuxTest.
  Fixed android.uirendering package in CTS-5.0_R3
  TV: add multiple tracks tests to CtsVerifier
  TV: Add parental control tests to CtsVerifier
  TV: add a test for overlay view from TV input to CtsVerifier
  Add TV app tests to CtsVerifier
  DO NOT MERGE - Add security test for IEffect binder command
  ...