am 4d716708: (-s ours) Merge "synchronized audio beat detection: DO NOT MERGE" into ics-aah

* commit '4d7167086dfeb8ea44cba9107f058797e0bedd2d':
  synchronized audio beat detection: DO NOT MERGE