summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice/ActivityManager.cpp
diff options
context:
space:
mode:
authorJohn Grossman <johngro@google.com>2012-08-24 09:22:23 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-08-24 09:22:23 -0700
commite171593f9afb2b345257cc8e6599f8da9b3437c3 (patch)
tree77f07b8a0d4aeb0ff8ad0badf69cab797ce415ef /media/libmediaplayerservice/ActivityManager.cpp
parente4b03a9c2a467b1bc088962e055092c76a5f7ad5 (diff)
parent6de95261c619d53f3e7b431fd17995e73928571e (diff)
downloadframeworks_av-e171593f9afb2b345257cc8e6599f8da9b3437c3.zip
frameworks_av-e171593f9afb2b345257cc8e6599f8da9b3437c3.tar.gz
frameworks_av-e171593f9afb2b345257cc8e6599f8da9b3437c3.tar.bz2
am 6de95261: Merge "Add a missing NULL check." into jb-mr1-dev
* commit '6de95261c619d53f3e7b431fd17995e73928571e': Add a missing NULL check.
Diffstat (limited to 'media/libmediaplayerservice/ActivityManager.cpp')
0 files changed, 0 insertions, 0 deletions