tree c5da560c7bd8838431a3550300e62dd5369005a4
parent 4942d4a8ccc30fb263e322423eb22984a70a4d79
parent 2eecd3ab99c71e918619a1af073b347deb564782
author Mark Salyzyn <salyzyn@google.com> 1493673376 +0000
committer android-build-merger <android-build-merger@google.com> 1493673376 +0000

Merge "libcutils: fs_config.c mark vendor, odm and oem partitions in duplicate" am: 43e9106410
am: 2eecd3ab99

Change-Id: I44d0bab63b27fcb34193d37b2d0962d06276ba01