diff options
| author | Justin DeMartino <jjdemartino@google.com> | 2020-10-14 19:39:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-10-14 19:39:53 +0000 |
| commit | 0d11af03e43f110b0bb160f7e20436d0043e3038 (patch) | |
| tree | 48f8bcca856276ec73a86dd3fb26143d3ca64578 /libutils/include/utils/Flattenable.h | |
| parent | 075666ebd0dee8d0c4a2efa54f7c324a3f67ee2a (diff) | |
| parent | a6c01e4e98d2b343dcecfc99611e2e6250c730db (diff) | |
Merge changes from topic "SP1A.200921.001" into s-keystone-qcom-dev
* changes:
fs_mgr: adb-remount-test.sh: filter out more administrivia mounts.
Merge SP1A.200921.001 Change-Id: I90b97c4e9fb10b1f45e74def404823eed5b1aaa8
Diffstat (limited to 'libutils/include/utils/Flattenable.h')
| -rw-r--r-- | libutils/include/utils/Flattenable.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/libutils/include/utils/Flattenable.h b/libutils/include/utils/Flattenable.h index 17c5e1057..8aa381a8f 100644 --- a/libutils/include/utils/Flattenable.h +++ b/libutils/include/utils/Flattenable.h @@ -14,8 +14,7 @@ * limitations under the License. */ -#ifndef ANDROID_UTILS_FLATTENABLE_H -#define ANDROID_UTILS_FLATTENABLE_H +#pragma once // DO NOT USE: please use parcelable instead // This code is deprecated and will not be supported via AIDL code gen. For data @@ -25,7 +24,6 @@ #include <string.h> #include <sys/types.h> #include <utils/Errors.h> -#include <utils/Debug.h> #include <type_traits> @@ -217,5 +215,3 @@ public: }; } // namespace android - -#endif /* ANDROID_UTILS_FLATTENABLE_H */ |