OSDN Git Service

Merge "Fixes Treble marshaling of strings embedded in structures from Java" am: 97fca...
authorAndreas Huber <andih@google.com>
Tue, 7 Feb 2017 14:12:09 +0000 (14:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 7 Feb 2017 14:12:09 +0000 (14:12 +0000)
am: 390cd6ceda

Change-Id: I0b1ba7490adaaec8f4eaa7e4afada7425f8c1129


Trivial merge