diff options
author | Steve Block <steveblock@google.com> | 2012-01-09 23:24:46 +0000 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2012-01-09 23:24:46 +0000 |
commit | 03f1910431433f3a35f1445aa0bba2b00417f0cc (patch) | |
tree | 3b74e3c04d9b15fad533b1e0eb380ddcdd93b181 /rsType.cpp | |
parent | c0a65425f8eb3573b1abd2a48292ca953c0a8590 (diff) | |
parent | af12ac6a08651464f8d823add667c706f993b587 (diff) | |
download | rs-03f1910431433f3a35f1445aa0bba2b00417f0cc.tar.gz |
resolved conflicts for merge of 08289f55 to graphics-dev
Change-Id: I2c95cd461e364cbeae7ffbaea7ad5c87713d7df7
Diffstat (limited to 'rsType.cpp')
-rw-r--r-- | rsType.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -170,7 +170,7 @@ Type *Type::createFromStream(Context *rsc, IStream *stream) { // First make sure we are reading the correct object RsA3DClassID classID = (RsA3DClassID)stream->loadU32(); if (classID != RS_A3D_CLASS_ID_TYPE) { - LOGE("type loading skipped due to invalid class id\n"); + ALOGE("type loading skipped due to invalid class id\n"); return NULL; } |