Merge changes from topic "lshal_improve" am: 0639471d64

am: 3d76135f94

Change-Id: I2cb0588df3a90929535019c88ad9b9b71a70d763
This commit is contained in:
Yifan Hong 2018-05-29 12:39:04 -07:00 committed by android-build-merger
commit e460f4122f
2 changed files with 2 additions and 2 deletions

View file

@ -799,7 +799,7 @@ void ListCommand::registerAllOptions() {
mOptions.push_back({'l', "released", no_argument, v++, [](ListCommand* thiz, const char*) {
thiz->mSelectedColumns.push_back(TableColumnType::RELEASED);
return OK;
}, "print the 'is released?' column\n(Y=released, empty=unreleased or unknown)"});
}, "print the 'is released?' column\n(Y=released, N=unreleased, ?=unknown)"});
mOptions.push_back({'t', "transport", no_argument, v++, [](ListCommand* thiz, const char*) {
thiz->mSelectedColumns.push_back(TableColumnType::TRANSPORT);
return OK;

View file

@ -34,7 +34,7 @@ static const std::string &getArchString(vintf::Arch arch) {
static const std::string sStr64 = "64";
static const std::string sStr32 = "32";
static const std::string sStrBoth = "32+64";
static const std::string sStrUnknown = "";
static const std::string sStrUnknown = "?";
switch (arch) {
case vintf::Arch::ARCH_64:
return sStr64;