am 80721ae5: am 8ba6e006: Merge "More video related API fixes" into mnc-dev

* commit '80721ae50146fac98e130317b071841ba6d70463':
  More video related API fixes
tree: 6cf19910a1e7614bdc55a763d33c8a7c0558c687
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags