OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
61ba752
42542ca
)
Merge "Merge "MediaPlayer: ensure that jni code returns after throwing exceptions...
author
Dongwon Kang
<dwkang@google.com>
Thu, 24 May 2018 23:08:11 +0000
(16:08 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 24 May 2018 23:08:11 +0000
(16:08 -0700)
am:
42542ca0bb
Change-Id: I2c892282a2aee6b03395b1c61ebae19df8c4397c
Trivial merge