commit 95fcd9e48624f4fd5260922476b638380f128e55
author Jean-Baptiste Queru <jbq@google.com> Fri Nov 19 10:27:51 2010 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Nov 19 10:27:51 2010 -0800
tree b4e09ea20f4fb47a76d0d34499f62d1406838549
parent 44868fdbb0d0b2b4ac59e999031c1e2c017c4dd5
parent f69f356ebaf33aa150817c44ee2bd781f24e4e71

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*