commit | 5f815de2a6770cbbf6f15a89b6adae63e75ae915 | [log] [tgz] |
---|---|---|
author | Jean-Michel Trivi <jmtrivi@google.com> | Thu Aug 28 22:57:31 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 28 22:57:31 2014 +0000 |
tree | ef1df232a643875fab2d0d77958c9da7f199e8d1 | |
parent | 97a3377dfe05897290953acc64ea24a4092fe5dd [diff] | |
parent | b1dd80a8c2b192119cb0c4c5534ab6aa9a3f23cf [diff] |
am 1917d96b: am f9882022: Merge "More AudioManager.generateAudioSessionId() javadoc" into lmp-dev * commit '1917d96b04d910027a90023d986130548a4f7ab1': More AudioManager.generateAudioSessionId() javadoc