Merge "CameraManager: Swap propertyName / packageName in call to getProperty()" into tm-qpr-dev am: f580918fe5 am: 996fbec1b7 am: 3d1b8b9a3f am: 32a121ca7c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21944836 Change-Id: I36be6ad94f1521e82d7eaefe1f2110a3a33ca83b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: