tree c3a71cabdefaa54d0ed2cb7277ff8f87d521c044
parent 7e82370fedc35d0229365c519b8a5e88d3c5555d
parent d36fa085d6acb9976a2c3810eceef92c5daba9e1
author Treehugger Robot <treehugger-gerrit@google.com> 1596237036 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596237036 +0000

Merge "AOSP/Camera2 - Update language to comply with Android's inclusive language guidance. Changed blacklist to disallowedlist." am: d36fa085d6

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/1382611

Change-Id: I9c4cf76d79b5a0a10f9b293eb125a3637a90dfd7