commit | caf6456de95e5682daf0241d99572547152a59f2 | [log] [tgz] |
---|---|---|
author | Elliott Hughes <enh@google.com> | Tue May 29 22:51:10 2018 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Tue May 29 22:51:10 2018 -0700 |
tree | c045c88f83684850b7f557795c163fcc875f734e | |
parent | 57fda41600ae8d1c9d319fd2f45e20c26c92654f [diff] | |
parent | 9ba087e6c78bd40d4444946137511f025ce37d9e [diff] |
Merge "init; remove dead cruft." am: dfc4ad2a9c am: 8d69c92b6d am: a391213d8a Change-Id: I6270af0b17f36b683bf4d84e024e694e6c3c66ca
diff --git a/init/action_parser.cpp b/init/action_parser.cpp index f9b96eb..8a4b518 100644 --- a/init/action_parser.cpp +++ b/init/action_parser.cpp
@@ -21,10 +21,6 @@ #include "stable_properties.h" -#if !defined(__ANDROID__) -#include "host_init_stubs.h" -#endif - using android::base::GetBoolProperty; using android::base::StartsWith;