Merge "Ensure upgrade to video requests are ignored when video disabled." am: 236b6f319e
am: 29ec0fb190

Change-Id: Id9637a0e75b3e9bc1e0c3dbbcfe463803a64fcc5
tree: 9d82711dccccfdcdb3b8559e800f04fe30d61d01
  1. src/
  2. tests/
  3. Android.mk
  4. CleanSpec.mk
  5. OWNERS
  6. README.txt