commit | ff642c408c9fecf816f984f244d8f8300138c747 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Aug 05 16:47:03 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 05 16:47:03 2020 +0000 |
tree | e452c115f6b321996b15fc60c70608644538f08e | |
parent | c94e810cabc04da9e7327ef002a678486d8e1f6f [diff] | |
parent | 830c70ad25f93e670dd8e8aafd979825903b9790 [diff] |
Merge "Parent: cc2d51fc (Merge "Update language to comply with Android's inclusive language guidance") Author: Paul McLean <pmclean@google.com> AuthorDate: 2020-07-28 15:07:26 +0000 Commit: Glenn Kasten <gkasten@android.com> CommitDate: 2020-08-04 00:06:51 +0000" am: 830c70ad25 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1374724 Change-Id: I32f6e92956fc98e60691483f9a6905bbce25c74e