tree b94c370746e62ef79eaffeba51c32bf7746359c9
parent 66a839f5d040764ccc490d6573c96243b84cd8f5
parent bbef2b3f42de20c7d2a920de62d3d1eca40e054f
author Eric Laurent <elaurent@google.com> 1364257722 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1364257722 +0000

am 19c11e1c: Merge "ToneGenerator: optimize silent tone" into jb-mr2-dev

* commit '19c11e1c854ae3c20bacf66fbb20d53dcdb8d100':
  ToneGenerator: optimize silent tone