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

Change-Id: I4d9e312a89c4c5f8e5f8665c8ac51efa93b436ff
tree: 96f342849124b4835d7c807af5d4c484420c0e2f
  1. src/
  2. tests/
  3. Android.mk
  4. CleanSpec.mk
  5. OWNERS
  6. README.txt