OSDN Git Service

resolved conflicts for merge of 42f55d1e to master
authorMarco Nelissen <marcone@google.com>
Thu, 12 Mar 2015 23:17:45 +0000 (16:17 -0700)
committerMarco Nelissen <marcone@google.com>
Thu, 12 Mar 2015 23:17:45 +0000 (16:17 -0700)
commita80ac05f85962949d5072831200d86a7023575fb
tree38dc9f9fc058ff52ee76e2e82df9e01edccb6b6f
parentd58617b4f519e69cf8a828210f138d2bcbe4e20a
parent42f55d1e689c510198b62a1747a5fd8f8dcbff9b
resolved conflicts for merge of 42f55d1e to master

Change-Id: I9c26861c5b0e26bb55e50b2133b7561348a01aec
core/java/android/widget/VideoView.java
media/java/android/media/AudioManager.java