commit | 1d3488cba90bea114c9c5e8f0d4a008d2aa34bfd | [log] [tgz] |
---|---|---|
author | Marco Nelissen <marcone@google.com> | Fri May 10 12:44:05 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 10 12:44:05 2013 -0700 |
tree | 8192a8392d5a291ed39520ba8d88b5355b39489d | |
parent | 16ea91db8c000ad33c665dd4ae3a6dadd7aac62c [diff] | |
parent | 86e0b491d1b50e59221420de3005184b1dee8373 [diff] |
am 86e0b491: Merge "Add VideoView.getAudioSessionId()" into jb-mr2-dev * commit '86e0b491d1b50e59221420de3005184b1dee8373': Add VideoView.getAudioSessionId()