tree d768dbb7ede0288ac97c77ac12b51f8a19ec7c1a
parent 582ae993d473923e68212d9babeebe04eaaafb9c
parent 406e163b79c75209e49c3d1e4accfad35e916f3b
author Patrik Fimml <patrikf@google.com> 1545398527 -0800
committer android-build-merger <android-build-merger@google.com> 1545398527 -0800

[automerger skipped] Push cameraserver downstream from base_system.mk. am: 9d717edf6c
am: 406e163b79  -s ours

Change-Id: I03ddd87e67919af35ddbefd1b28c7b333b68ff9f