tree 0612a586c5991999d1001bc973827f4bce14af7d
parent 92a7a63d932ef0fb8a1559703fe02782a72af69f
parent 29327cbed9406af15f4a7607211e167f92321674
author Steven Moreland <smoreland@google.com> 1502482829 +0000
committer android-build-merger <android-build-merger@google.com> 1502482829 +0000

Merge "Reference ScopedUtfChar header correctly." into stage-aosp-master am: 3f378940c2 am: 93d8497094
am: 29327cbed9

Change-Id: I93c10835f80d9330c2d7dfd02db97df34005e7b6