tree d81990b8077083b21b3a50b456d4d8492ccb110e
parent cd58b3376020188e27672e6d7dba421c5b83bb31
parent cba24188b27dc77c1c7dbe83d4c509f55b10ff54
author Yiwei Zhang <zzyiwei@google.com> 1516125577 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1516125577 +0000

Merge "Make cst-device-info to compile with new vkjson"