commit | e177a3da930233030a32fab2062c248640cacc44 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Sep 03 15:27:07 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 03 15:27:07 2020 +0000 |
tree | 499b712621abdd11f8f8efc50785af9e90745f8e | |
parent | d7b4b5592342b56754a1e66ac2638a6a4ad28f4b [diff] | |
parent | 94fbf790d7e626667fb01ecf80c643ac08934cb9 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 94fbf790d7 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12515250 Change-Id: I2afceeedf1a90fc10c981a4d139004ce5f237030