tree cb1d325349f12e87dde4829994cf3a82fb7f2fd3
parent d06852a5a484f0b9985120dba52f0653e147b7b3
parent 0d33ca967334fcf186d41bdf686f87d4eb5ddc8c
author Eric Laurent <elaurent@google.com> 1471622492 +0000
committer android-build-merger <android-build-merger@google.com> 1471622492 +0000

Merge "Fix for tone glitch produced in ToneGenerator" am: 46f1c24c5a am: 84183ba496 am: 09b0b40fb4 am: 67b5bb745b am: b29385110c
am: 0d33ca9673

Change-Id: I21de71fcae297b9038711cc3f9b5cf1550de1b7a