am 47a5f404: (-s ours) Merge "DO NOT MERGE - Small documentation fix for...
am 47a5f404: (-s ours) Merge "DO NOT MERGE - Small documentation fix for AudioManager.java" into jb-mr2-dev
* commit '47a5f404':
DO NOT MERGE - Small documentation fix for AudioManager.java