summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorChih-hung Hsieh <chh@google.com>2014-11-17 20:03:48 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-17 20:03:48 +0000
commitd86450b93ab3960ccd68aed14563aaa76b43ce9b (patch)
treea6a2057e69e40f15b8437a086b3fb9b49bfc4542 /include
parent2716969d2b88e85a6ed5a766b54a0a34dc137118 (diff)
parentc80b9b834b2e443a2010e3b6d90d50d8b4a60fe4 (diff)
downloadframeworks_av-d86450b93ab3960ccd68aed14563aaa76b43ce9b.zip
frameworks_av-d86450b93ab3960ccd68aed14563aaa76b43ce9b.tar.gz
frameworks_av-d86450b93ab3960ccd68aed14563aaa76b43ce9b.tar.bz2
am c80b9b83: Merge "Fix struct vs. class mismatches"
* commit 'c80b9b834b2e443a2010e3b6d90d50d8b4a60fe4': 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 {