am f7b93a9b: am 0338af46: (-s ours) am 99253c2d: am fde59428: Merge "Handle /oem and /vendor as well"
* commit 'f7b93a9b7c01a364436a46b0b9389f4be0d89e5a': Handle /oem and /vendor as well
This commit is contained in: