OSDN Git Service

Merge "ScopedUtfChars: use proper nativehelper headers" am: 75c9e4d594 am: e04a0bf5c7...
authorSteven Moreland <smoreland@google.com>
Fri, 11 Aug 2017 22:28:23 +0000 (22:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 11 Aug 2017 22:28:23 +0000 (22:28 +0000)
am: d5593e0f19  -s ours

Change-Id: Ieb4c1ef120eca3bab9c561adb1295c8dd9ed39de


Trivial merge