am 5433e25f: am 7b6aff23: Merge "audioflinger: fix audio skipping over A2DP" into ics-mr1

* commit '5433e25f6ce013860ff2a074ad8d1158cc39ab91':
  audioflinger: fix audio skipping over A2DP
tree: 6a3dcfe5e1ffcc3d3f839e19ded8b645f352f51e
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/