| commit | 56274ef49cc583c12a82d7a88133d415e1f159ac | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Sun Sep 06 07:26:24 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Sep 06 07:26:24 2020 +0000 |
| tree | d5d8afda55ebbeb886aebc62d0e0bbc6706fac79 | |
| parent | 113ea77b05cf97285ff8276993e6e7a3b06f09d3 [diff] | |
| parent | 92d99c925cf705bf8cecfeaa9529af26b6297a82 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: a2418b59c7 -s ours am: b26a82e212 -s ours am: e445a9438d -s ours am: 92d99c925c -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420007 Change-Id: I3ec579c9c49125ef9ac8436e37b56d3cf40a427a