tree 9f21c3c95b7ea8b1003e976f01fac21d6c91d23d
parent 801d27d4d76aa040e83c9d9a2286909fd6661b88
parent faf2adda1b3644079e202c2286c817843ecc115d
author Eric Laurent <elaurent@google.com> 1468357794 +0000
committer android-build-merger <android-build-merger@google.com> 1468357794 +0000

Merge \\"Fix WaveGenerator memory leak\\" am: f58e41ab2f
am: faf2adda1b

Change-Id: I7f2fbc21275ad795a464146add84321b9161447f