am 34a4e519: am 6e6d8df5: Merge "Adding camera zoom test to mediaframework stress suite." into ics-mr1

* commit '34a4e519b298941760c1d6797142a9ebca003627':
  Adding camera zoom test to mediaframework stress suite.