| commit | 9ba087e6c78bd40d4444946137511f025ce37d9e | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue May 29 21:44:51 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue May 29 21:44:51 2018 -0700 |
| tree | e01b4f0e9846152378330d2523ba6bf10002334f | |
| parent | f3189a5af6dd423dd0b3bb1e3e656e9c7a815ed9 [diff] | |
| parent | 3365939e87a691894cd65b4da21a0fb6363ed2d8 [diff] |
Merge "init; remove dead cruft." am: dfc4ad2a9c am: 8d69c92b6d Change-Id: Icb02fb3fa4580fe69cd72fc6f288bc6d92347df9
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;