commit | b55d292da6cd502d84a47f25ce161779875914ad | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Sun Sep 06 06:36:18 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Sep 06 06:36:18 2020 +0000 |
tree | c43b959ebcbe451da1190f98d4d90e0d35e58932 | |
parent | 0d0783929a75d049f8e26942371de1f027fb014d [diff] | |
parent | 5443e7b99d855b7acd3765ee8c8ca0aeeb224aab [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5443e7b99d -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420006 Change-Id: Ic09f7bf8b025fd9479b2e71c266d89d4d154fb19