summaryrefslogtreecommitdiffstats
path: root/core/jni
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2010-11-19 10:27:51 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-11-19 10:27:51 -0800
commit95fcd9e48624f4fd5260922476b638380f128e55 (patch)
treeb4e09ea20f4fb47a76d0d34499f62d1406838549 /core/jni
parent44868fdbb0d0b2b4ac59e999031c1e2c017c4dd5 (diff)
parentf69f356ebaf33aa150817c44ee2bd781f24e4e71 (diff)
downloadframeworks_base-95fcd9e48624f4fd5260922476b638380f128e55.zip
frameworks_base-95fcd9e48624f4fd5260922476b638380f128e55.tar.gz
frameworks_base-95fcd9e48624f4fd5260922476b638380f128e55.tar.bz2
am f69f356e: am 14ac9546: Merge "build failed with g++ v. 4.4.5 err msg: frameworks/base/media/libstagefright/MediaExtractor.cpp:62: error: invalid conversion from ‘const char*’ to ‘char*’ strrchr provides two prototypes. the one used returns const char* inste
* commit 'f69f356ebaf33aa150817c44ee2bd781f24e4e71': build failed with g++ v. 4.4.5 err msg: frameworks/base/media/libstagefright/MediaExtractor.cpp:62: error: invalid conversion from ‘const char*’ to ‘char*’ strrchr provides two prototypes. the one used returns const char* instead of char*
Diffstat (limited to 'core/jni')
0 files changed, 0 insertions, 0 deletions