OSDN Git Service

Merge "Merge "MediaPlayer: ensure that jni code returns after throwing exceptions...
authorDongwon Kang <dwkang@google.com>
Thu, 24 May 2018 23:08:11 +0000 (16:08 -0700)
committerandroid-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