tree 8bcda6864ea1598c0957ece80b341f448df0b837
parent 794d320948d532709c52be0cb98705733867efb1
parent e31881eee441f409cbe6c1e1f32183ee8a64cdf8
author Eric Laurent <elaurent@google.com> 1364430593 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1364430593 -0700

am 2d595c0e: Merge "ToneGenerator: fix stop/destroy concurrency" into jb-mr2-dev

* commit '2d595c0efc0eee9e0c94f4842c6fed07c19163c1':
  ToneGenerator: fix stop/destroy concurrency