tree 40f5c4f5dfbd0493070fd12101b149a535a6a04a
parent cc4443498bdd5de36d57089064b4235438d2805c
parent b29385110c3f6a52e209c0e1cf70e9cf2eed5e89
author Eric Laurent <elaurent@google.com> 1471621950 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1471621951 +0000

Merge "Merge "Fix for tone glitch produced in ToneGenerator" am: 46f1c24c5a am: 84183ba496 am: 09b0b40fb4 am: 67b5bb745b" into nyc-mr1-dev