Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 6ba4c9d9: am c78b33d0: Merge "split-select: fix OSX build" into lmp-mr1-dev automerge: be593a7

Browse Source 
* commit '6ba4c9d91bfcd2acf3ad85db0a7945438ab4548c':
  split-select: fix OSX build
This commit is contained in:
Adam Lesinski
2014-11-11 03:01:46 +00:00
committed by Android Git Automerger
parent 744300b738 6ba4c9d91b
commit cbaa1c617b
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/split-select/TestRules.cpp
View File

@@ -75,7 +75,7 @@ const Rule AlwaysTrue() {
const char*, const char*,
const sp<Rule>& actual, const Rule& expected) {
const String8 expectedStr(expected.toJson());
const String8 actualStr(actual != NULL ? actual->toJson() : "");
const String8 actualStr(actual != NULL ? actual->toJson() : String8());
if (expectedStr != actualStr) {
return ::testing::AssertionFailure()