tree f6753634554332c095e537ccc6becd845cd82aa9
parent 80b7ccb67a630f982ca9ba7e742dab4f85e6e741
parent a3aaa5ee2558ac5a6b6ca0b309dc9eea4c51bf14
author Christopher Tate <ctate@google.com> 1463764270 +0000
committer android-build-merger <android-build-merger@google.com> 1463764270 +0000

Merge "Back up / restore the \'mono audio\' setting" into nyc-dev
am: a3aaa5ee25

* commit 'a3aaa5ee2558ac5a6b6ca0b309dc9eea4c51bf14':
  Back up / restore the 'mono audio' setting

Change-Id: Ieb242d2d382218b6090acf0e72c33c865fb0994b