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