tree a17542b208d7f778b231390410a732db41e11eb0
parent a16ee7c6174a1448bd306c4a67027c792aeb6e63
parent 79d550b4d4f5341da39b93fbf244767fe46c8497
author Zheng Zhang <zhzh@google.com> 1486754346 +0000
committer android-build-merger <android-build-merger@google.com> 1486754346 +0000

Merge "audio: hal: fix power issue if tfa98xx calibration failed am: 32847effc9 am: 7bf8526a38" into nyc-mr2-dev-plus-aosp
am: 79d550b4d4

Change-Id: Idb0264e7cfe94fb77551308fde0d9b83e9295705