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

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