tree c9f593eb6a4f2a2aaef3d400366525048e40a2b5
parent f194cb3b99323a7957274ec8e74d2077291f5e47
parent 430b7ae4699eb3685dcc0f7c736a9aebd76829a8
author Tianjie Xu <xunchang@google.com> 1476750119 +0000
committer android-build-merger <android-build-merger@google.com> 1476750119 +0000

Merge "Change StringValue to use std::string" am: 2b17b24ae5
am: 430b7ae469

Change-Id: Ife83f67a57629747b9804ca332265344a8350d2a