tree 11c045f03a68cad20425e1448fbdc11fb9242b9f
parent c3fd10acaa47bc973e31f71f1925b8a2797b731a
parent 46f1c24c5ac7711702147c4db20e791827a88371
author Eric Laurent <elaurent@google.com> 1471524013 +0000
committer android-build-merger <android-build-merger@google.com> 1471524013 +0000

Merge "Fix for tone glitch produced in ToneGenerator"
am: 46f1c24c5a

Change-Id: If7da9dbfe106fdda640fc817a4fffe05b2ed5dff