summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorChih-hung Hsieh <chh@google.com>2014-11-17 20:07:50 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-17 20:07:50 +0000
commit8c5ee61a057e3b87e8f0800b284642bf3b107fd0 (patch)
tree9ccc1ab733f8d17f535d455864206a024f8be2c1 /include
parentf1b0c671e85d7ad5e1aa94d16336cda57158cd33 (diff)
parentd86450b93ab3960ccd68aed14563aaa76b43ce9b (diff)
downloadframeworks_av-8c5ee61a057e3b87e8f0800b284642bf3b107fd0.zip
frameworks_av-8c5ee61a057e3b87e8f0800b284642bf3b107fd0.tar.gz
frameworks_av-8c5ee61a057e3b87e8f0800b284642bf3b107fd0.tar.bz2
am d86450b9: am c80b9b83: Merge "Fix struct vs. class mismatches"
* commit 'd86450b93ab3960ccd68aed14563aaa76b43ce9b': Fix struct vs. class mismatches
Diffstat (limited to 'include')
-rw-r--r--include/media/stagefright/foundation/AString.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/media/stagefright/foundation/AString.h b/include/media/stagefright/foundation/AString.h
index 7c98699..c3a68e1 100644
--- a/include/media/stagefright/foundation/AString.h
+++ b/include/media/stagefright/foundation/AString.h
@@ -23,7 +23,7 @@
namespace android {
-struct String8;
+class String8;
struct Parcel;
struct AString {