tree f13238cc04f8d89e81b95c514e0d62077a562fec
parent e25c1b3ae21dd2ea0ffe944f628abfb1cdd6e73b
parent fb171fba597f241b5f71eee6912592543a9d0ef0
author Patrik Fimml <patrikf@google.com> 1545398828 -0800
committer android-build-merger <android-build-merger@google.com> 1545398828 -0800

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

Change-Id: I26e2c3c7cb2846f818519afce0f6364b97170f36