summaryrefslogtreecommitdiffstats
path: root/services/jni
diff options
context:
space:
mode:
authorChristopher Tate <ctate@google.com>2010-06-30 15:33:35 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-06-30 15:33:35 -0700
commit705a2df97c51c3e31ed36831a4302d705e0532b2 (patch)
treef0ea448b021db6be27f69f432d12862bb40103c9 /services/jni
parent9b4b74becf0e99b0a9090758d6337c6615cff1d1 (diff)
parentc8525edcba58cba7ce17ef72bc64fc3439943c08 (diff)
downloadframeworks_base-705a2df97c51c3e31ed36831a4302d705e0532b2.zip
frameworks_base-705a2df97c51c3e31ed36831a4302d705e0532b2.tar.gz
frameworks_base-705a2df97c51c3e31ed36831a4302d705e0532b2.tar.bz2
am c8525edc: Merge "Remove memory monitoring from the system watchdog" into gingerbread
Merge commit 'c8525edcba58cba7ce17ef72bc64fc3439943c08' into gingerbread-plus-aosp * commit 'c8525edcba58cba7ce17ef72bc64fc3439943c08': Remove memory monitoring from the system watchdog
Diffstat (limited to 'services/jni')
0 files changed, 0 insertions, 0 deletions