tree accd11aca15da028b675c4314193728aaedfc90f
parent 6797293e267d9ee05d976f3c926cc2119af3eb1e
parent 404b6e6ee588af71d19fe8a4ffc8092d59c3396d
author Eric Laurent <elaurent@google.com> 1468363928 +0000
committer android-build-merger <android-build-merger@google.com> 1468363928 +0000

Merge \\"Fix WaveGenerator memory leak\\" into nyc-mr1-dev am: 28743b7999
am: 404b6e6ee5

Change-Id: I3b97b23e68b23de74f1ff0130f9c9d721bf47382