commit 7528f2253a5327d8b23f30b36807f5000fce13a6
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 119214c6e9d6a946df03ebfbe906651feb0f1668
parent 1045860ed90ea309ae1a9cacec5f60630b210a47
parent 414633971be752843118784d198f79d6b5f20f76

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*