OSDN Git Service

(root) / android-x86 / frameworks-base.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: be718d8 d579be0)
resolve merge conflicts of d579be0 to nyc-dev-plus-aosp
authorRobert Shih <robertshih@google.com>
Wed, 1 Jun 2016 21:53:09 +0000 (14:53 -0700)
committerRobert Shih <robertshih@google.com>
Wed, 1 Jun 2016 21:53:09 +0000 (14:53 -0700)
commit4c3d43d2c2ef9f9176fae6d897d01ec57e3970cd
treed8d64c4cb303bc661b5e75ddeaf97244ba1186f0tree | snapshot
parentbe718d8836e85b8bff0de83e4fefbd92675c0855commit | diff
parentd579be0cf234a35273f79676c102b8bd80e071dccommit | diff
resolve merge conflicts of d579be0 to nyc-dev-plus-aosp

Change-Id: Ib64df6377d95578581fd7d311aaffc3ef64dd622
media/java/android/media/MediaPlayer.java diff1 | diff2 | blob | history
frameworks/base
About OSDN
Find Software
Develop Software
Help