commit | 72d718407820e959813181d546f4ba25ed482cba | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Jul 31 23:10:36 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jul 31 23:10:36 2020 +0000 |
tree | c3a71cabdefaa54d0ed2cb7277ff8f87d521c044 | |
parent | 7e82370fedc35d0229365c519b8a5e88d3c5555d [diff] | |
parent | d36fa085d6acb9976a2c3810eceef92c5daba9e1 [diff] |
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