am c15cf3d2: Merge "stagefright: limit audio gap for looped playback" into ics-mr1

* commit 'c15cf3d286f3d63d141b73f639a5a61ddb028029':
  stagefright: limit audio gap for looped playback
tree: 0ddf435e065f725aebbd1a726eb1087f6e5decfb
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/