| commit | 4a93823eb29a5ef05b4232b78282b0623ab695bf | [log] [tgz] |
|---|---|---|
| author | Adam Shih <adamshih@google.com> | Tue Jul 13 02:31:46 2021 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Jul 13 02:31:46 2021 +0000 |
| tree | 2e4dcdb4e23917b568f164c23d4188f61de8b1a2 | |
| parent | 5d1808db003df1495feb309e93a706afaccb0cbc [diff] | |
| parent | 840a20d3a746bfb1e17f76a4060abb2b3ac32cdd [diff] |
Merge "sync codebase"
diff --git a/device.mk b/device.mk index cfebbf5..9a97691 100644 --- a/device.mk +++ b/device.mk
@@ -901,6 +901,7 @@ include hardware/google/pixel/pixelstats/device.mk include hardware/google/pixel/mm/device_legacy.mk include hardware/google/pixel/thermal/device.mk +include hardware/google/pixel/citadel/citadel.mk # power HAL -include hardware/google/pixel/power-libperfmgr/aidl/device.mk