commit 414633971be752843118784d198f79d6b5f20f76
author Jean-Baptiste Queru <jbq@google.com> Fri Nov 19 10:24:51 2010 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Nov 19 10:24:51 2010 -0800
tree d139737f456612500eda893c97e8576faee814f5
parent da6332fe7921815ce636e51ff02e39f9937cb140
parent 487ddf384fc5452cfa0fd9635861a7ab75c85370

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* instead of char*"

* commit '14ac9546367d4df37eead55f6762b944b49f33b2':
  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*