tree 17714066c2cef44035c16e30cf35dacd88de5b2a
parent 46b06cf79ee5125611c0138ef525423f4818c8df
parent 85bc83cee68767376c6d418ca43255c2d2ae5724
author Andy Hung <hunga@google.com> 1476943459 +0000
committer android-build-merger <android-build-merger@google.com> 1476943459 +0000

Merge "AudioFlinger: Account for frames dropped in suspend mode" am: 290e7ed8d0
am: 85bc83cee6

Change-Id: Ia46f1767fdf40a5c5676444503cf4b5d89a8dd09