tree f13238cc04f8d89e81b95c514e0d62077a562fec
parent c998695e05a86ec626bcb782d254acf1b4f1fb18
parent dd574b241d57e756f5f1c1bc051c135c7c19f519
author Patrik Fimml <patrikf@google.com> 1545398519 -0800
committer android-build-merger <android-build-merger@google.com> 1545398519 -0800

[automerger skipped] Merge "Push cameraserver downstream from base_system.mk." am: 8f3d20ffbf
am: dd574b241d  -s ours

Change-Id: Ia8c95ce84bb61e99dd7485f5c444d2cdd5fb1400