aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2010-11-24 08:45:31 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-11-24 08:45:31 -0800
commit9e04fcde67aca1596664e052c37424cbd910da57 (patch)
treecefb9c6bbf609bd75c8675fdf8d9faac7b552041
parentf629a737ebf5d04a55d14b6699e89873d9b50d94 (diff)
parent8f461e5cc2972ed5054469b92bc841c07a50b7cf (diff)
downloadsystem_core-9e04fcde67aca1596664e052c37424cbd910da57.tar.gz
system_core-9e04fcde67aca1596664e052c37424cbd910da57.tar.bz2
system_core-9e04fcde67aca1596664e052c37424cbd910da57.zip
am 8f461e5c: resolved conflicts for merge of 1a15cb7e to gingerbread-plus-aosp
* commit '8f461e5cc2972ed5054469b92bc841c07a50b7cf': [PATCH] Init - make sure the last parameter to execve is NULL
0 files changed, 0 insertions, 0 deletions