Merge "ScopedUtfChars: use proper nativehelper headers" am: 75c9e4d594 am: e04a0bf5c7 am: 99cb134bf2 -s ours
am: 7c9f93d832 -s ours
Change-Id: I3b96834e93a0787075902b6464c0b6cbef9d102e
This commit is contained in: