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:
b83d53d
6f8e939
)
Merge "DO NOT MERGE MediaPlayerService: avoid invalid static cast" into klp-dev am...
author
Robert Shih
<robertshih@google.com>
Mon, 22 Aug 2016 18:48:21 +0000
(18:48 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Mon, 22 Aug 2016 18:48:21 +0000
(18:48 +0000)
am:
6f8e939c58
-s ours
Change-Id: I5373a4e935db09eb7a98f55cb5266f475b3dcd01
Trivial merge