summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
diff options
context:
space:
mode:
authorMattias Falk <mattias.falk@sonyericsson.com>2010-08-30 15:27:16 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-30 15:27:16 -0700
commite82235ae7049badf6758ffef3c13080b135986f4 (patch)
tree8b3756b308ed72ccebd729f6e6637388ccf35e8d /media/libstagefright
parent4361fb512f49b432036637b172aabb22b1cabdec (diff)
parent4076d4f887097f3e6d2f1f3863172507629db0b9 (diff)
downloadframeworks_base-e82235ae7049badf6758ffef3c13080b135986f4.zip
frameworks_base-e82235ae7049badf6758ffef3c13080b135986f4.tar.gz
frameworks_base-e82235ae7049badf6758ffef3c13080b135986f4.tar.bz2
am 4076d4f8: am 12dbee82: Avoid NullPointerException in BrowserFrame
Merge commit '4076d4f887097f3e6d2f1f3863172507629db0b9' * commit '4076d4f887097f3e6d2f1f3863172507629db0b9': Avoid NullPointerException in BrowserFrame
Diffstat (limited to 'media/libstagefright')
0 files changed, 0 insertions, 0 deletions