Merge "Ensure upgrade to video requests are ignored when video disabled." into oc-mr1-dev am: a9732050e1
am: 5185dd85ca

Change-Id: I86e50ef485c9b8ac8113eedc4201367df1714df8
tree: 44748474edd84bec44c6748e1d14e1e34d2db9c2
  1. src/
  2. tests/
  3. Android.mk
  4. CleanSpec.mk
  5. OWNERS
  6. README.txt