OSDN Git Service

Merge "Return jobject when getting android Java Surface" into oc-dev
authorJiwen Cai <jiwen@google.com>
Wed, 29 Mar 2017 17:42:36 +0000 (17:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 29 Mar 2017 17:42:36 +0000 (17:42 +0000)
am: 9d7bbd8045

Change-Id: Ib499fa6ea6249a942ba29d982a0b3efa00ce7bec


Trivial merge