commit | f1dedd7daa69a16c32948e275f2019ad9b23fc10 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Jul 31 23:34:30 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jul 31 23:34:30 2020 +0000 |
tree | da4788b4d998760949a9b5089a33c5f0406c667b | |
parent | 7adada7f4403f8b2beed474116a35479485f2585 [diff] | |
parent | 72d718407820e959813181d546f4ba25ed482cba [diff] |
Merge "AOSP/Camera2 - Update language to comply with Android's inclusive language guidance. Changed blacklist to disallowedlist." am: d36fa085d6 am: 72d7184078 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/1382611 Change-Id: Icb248a176221bddd6fb39144f00a30b40c40767a