OSDN Git Service

(root) / android-x86 / frameworks-av.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 21cc110 08eab78)
DO NOT MERGE MediaPlayerService: avoid invalid static cast am: c159a5ae12 am: 2cee1de...
authorRobert Shih <robertshih@google.com>
Mon, 22 Aug 2016 18:32:19 +0000 (18:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 22 Aug 2016 18:32:19 +0000 (18:32 +0000)
am: 08eab78209  -s ours

Change-Id: I82a67d2a77c6cfa2e903e3ff8080ba4ed734f248


Trivial merge
frameworks/av
About OSDN
Find Software
Develop Software
Help