| commit | 214fa9a163d4a0f37fabceadc7fa060feed3959e | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Dec 04 22:34:26 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Dec 04 22:34:26 2020 +0000 |
| tree | 9d9c2f35b35f57b31b237c4dcf15d71a359927c3 | |
| parent | 5d8030ed5c9d906ed5ca4c35c9bd3f6820f26d99 [diff] | |
| parent | bd39b0abb4dc9670d9c408233bdacef400bc2ae5 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: ff565d3f39 -s ours am: bd39b0abb4 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13167384 Change-Id: Id2e262ae62c93007915d2615236778f7d026ce74