tree 2ced8c463458ca31ba16f1c4318f3a5cce934474
parent ad7e491494135b2ccd6887046333eb79a4e51121
parent 1e8d712b786f03a6a5a73814fd67b757b51d7c61
author Steven Moreland <smoreland@google.com> 1502412650 +0000
committer android-build-merger <android-build-merger@google.com> 1502412650 +0000

Merge "ScopedUtfChars: use proper nativehelper headers" into oc-dr1-dev-plus-aosp
am: 1e8d712b78

Change-Id: I52b50aec4319183bebacaf7fb03e51dd6b51157a