am bf831e0d: am 38f6bdc4: am 0a08029f: Fix issue  2306779: Runtime restart - Init failed at android.media.ToneGenerator.
am bf831e0d: am 38f6bdc4: am 0a08029f: Fix issue  2306779: Runtime restart - Init failed at android.media.ToneGenerator.

Merge commit 'bf831e0de0fd1636a7ee2670faed208f96f23f65'

* commit 'bf831e0de0fd1636a7ee2670faed208f96f23f65':
  Fix issue  2306779: Runtime restart - Init failed at android.media.ToneGenerator.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base