diff options
| author | Elliott Hughes <enh@google.com> | 2015-12-07 23:59:44 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-12-07 23:59:44 +0000 |
| commit | ef119a14b8f5a7eca18930e272e550ebf25217bd (patch) | |
| tree | dd071144e0c615cb93d5f03e0697736674452461 /gatekeeperd | |
| parent | 088113f419a50f360efa66efd9d88df849576e45 (diff) | |
| parent | 3608ee5e903689ea7c433587be664649689816e1 (diff) | |
| download | core-ef119a14b8f5a7eca18930e272e550ebf25217bd.tar.gz core-ef119a14b8f5a7eca18930e272e550ebf25217bd.tar.bz2 core-ef119a14b8f5a7eca18930e272e550ebf25217bd.zip | |
Merge "Track rename of base/ to android-base/." am: 912ed3d8ca am: e2a9563be1
am: 3608ee5e90
* commit '3608ee5e903689ea7c433587be664649689816e1':
Track rename of base/ to android-base/.
Diffstat (limited to 'gatekeeperd')
| -rw-r--r-- | gatekeeperd/SoftGateKeeper.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gatekeeperd/SoftGateKeeper.h b/gatekeeperd/SoftGateKeeper.h index c8010ca17..8b15d72e2 100644 --- a/gatekeeperd/SoftGateKeeper.h +++ b/gatekeeperd/SoftGateKeeper.h @@ -25,7 +25,7 @@ extern "C" { #include <crypto_scrypt.h> } -#include <base/memory.h> +#include <android-base/memory.h> #include <UniquePtr.h> #include <gatekeeper/gatekeeper.h> @@ -180,4 +180,3 @@ private: } #endif // SOFT_GATEKEEPER_H_ - |