aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy McFadden <fadden@android.com>2011-11-17 13:20:20 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-17 13:20:20 -0800
commit90284b1299a9cdf4411429fa7926de7ba59b245c (patch)
treea38cdf62c55a1c61915dde5e7b0a79f20a5eb419
parentcf4d03590ac1d105c37655f0f2fc890b78dab587 (diff)
parentc96d2aeed70f930d26236a20f6d32f0a24d83bd8 (diff)
downloadsystem_core-90284b1299a9cdf4411429fa7926de7ba59b245c.tar.gz
system_core-90284b1299a9cdf4411429fa7926de7ba59b245c.tar.bz2
system_core-90284b1299a9cdf4411429fa7926de7ba59b245c.zip
am c96d2aee: (-s ours) am 2a38657d: Merge "DO NOT MERGE - disable memory dumps" into ics-mr1
* commit 'c96d2aeed70f930d26236a20f6d32f0a24d83bd8': DO NOT MERGE - disable memory dumps
0 files changed, 0 insertions, 0 deletions