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

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