summaryrefslogtreecommitdiff
path: root/cmds/system_server/library/system_init.cpp
diff options
context:
space:
mode:
authorDaniel Sandler <dsandler@android.com>2013-05-09 12:39:12 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-05-09 12:39:12 -0700
commitb68de582fc9f1595dfb0562d9c5c20acd246e62f (patch)
tree9c5023e3a84a9800e7783d0d50e56ee7a2c747ba /cmds/system_server/library/system_init.cpp
parentbd8a17abadf3c0bf27e6d594d7b4dd7b589031e2 (diff)
parent06c31ff4cd949dc5444569257123a05642475d34 (diff)
am 06c31ff4: am 60ac308e: Merge "Defend against a system server crash." into jb-mr2-dev
* commit '06c31ff4cd949dc5444569257123a05642475d34': Defend against a system server crash.
Diffstat (limited to 'cmds/system_server/library/system_init.cpp')
0 files changed, 0 insertions, 0 deletions