OSDN Git Service
(root)
/
android-x86
/
frameworks-av.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e35213d
48b3aca
)
DO NOT MERGE MediaPlayerService: avoid invalid static cast am: c159a5ae12 am: 2cee1deec9
author
Robert Shih
<robertshih@google.com>
Mon, 22 Aug 2016 18:28:19 +0000
(18:28 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Mon, 22 Aug 2016 18:28:19 +0000
(18:28 +0000)
am:
48b3aca54b
-s ours
Change-Id: I1f9d2549a454da70e62cf2cc997c045965ecea9a
Trivial merge