am 3c193a4a: merge from open-source master
Merge commit '3c193a4a8d748faf420988250aabda0145e74bf7' * commit '3c193a4a8d748faf420988250aabda0145e74bf7': Fix %p vs %s typo in aapt message
This commit is contained in:
committed by
Android Git Automerger
commit
6179d2f928
@@ -401,7 +401,7 @@ int doDump(Bundle* bundle)
|
||||
ResXMLTree tree;
|
||||
asset = assets.openNonAsset(resname, Asset::ACCESS_BUFFER);
|
||||
if (asset == NULL) {
|
||||
fprintf(stderr, "ERROR: dump failed because resource %p found\n", resname);
|
||||
fprintf(stderr, "ERROR: dump failed because resource %s found\n", resname);
|
||||
goto bail;
|
||||
}
|
||||
|
||||
@@ -427,7 +427,7 @@ int doDump(Bundle* bundle)
|
||||
ResXMLTree tree;
|
||||
asset = assets.openNonAsset(resname, Asset::ACCESS_BUFFER);
|
||||
if (asset == NULL) {
|
||||
fprintf(stderr, "ERROR: dump failed because resource %p found\n", resname);
|
||||
fprintf(stderr, "ERROR: dump failed because resource %s found\n", resname);
|
||||
goto bail;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user