summaryrefslogtreecommitdiffstats
path: root/media/jni
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2010-07-26 12:30:28 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-07-26 12:30:28 -0700
commit9765211b9031776b9bcdd64e141de11f50902599 (patch)
treea09c1c1a71f00e2e1c35dbf2988b30bd3d897185 /media/jni
parentf4d9a21a4c7775ec4ee4b49f8f2bc10e5bc7c20d (diff)
parent64f04a645ea4fd81cfb41fba23d9ba9e1279d416 (diff)
downloadframeworks_base-9765211b9031776b9bcdd64e141de11f50902599.zip
frameworks_base-9765211b9031776b9bcdd64e141de11f50902599.tar.gz
frameworks_base-9765211b9031776b9bcdd64e141de11f50902599.tar.bz2
am 64f04a64: am 70736a6d: Merge "Avoid starting multiple threads in ShutdownThread" into gingerbread
Merge commit '64f04a645ea4fd81cfb41fba23d9ba9e1279d416' * commit '64f04a645ea4fd81cfb41fba23d9ba9e1279d416': Avoid starting multiple threads in ShutdownThread
Diffstat (limited to 'media/jni')
0 files changed, 0 insertions, 0 deletions