Merge changes I150dc5fe,I72d327c2,I6c5a97dc am: 46ec1a561d am: e95608bd90 am: 46759aec29

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1429028

Change-Id: Ie03543960a3d9ea7cd1c3036db4d2bf7cd2fac90
This commit is contained in:
Tom Cherry 2020-09-16 22:24:25 +00:00 committed by Automerger Merge Worker
commit 08b996a9d0
3 changed files with 0 additions and 6 deletions

View file

@ -1 +0,0 @@
../../libcutils/include/private/android_filesystem_capability.h

View file

@ -1 +0,0 @@
../../libcutils/include/private/canned_fs_config.h

View file

@ -1,4 +0,0 @@
// TODO(b/63135587) remove this file after the transitive dependency
// from private/android_filesystem_config.h is resolved. All files that use
// libcutils/include/private/fs_config.h should include the file directly, not
// indirectly via private/android_filesystem_config.h.