diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-06 09:01:15 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-06 09:01:15 +0000 |
commit | 235ab961699dec70d6fe94c3cd461cbfc09a37f9 (patch) | |
tree | 54d8e876442b45818ca6c60228e1b3479197c508 /tools/stats_log_api_gen/java_writer.cpp | |
parent | c50d389e2e3ac7d4aea946f5132d8692bf22a52e (diff) | |
parent | cf3a5fb7b73f45000605909c5e6df2b16dffc8ae (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 65997ef7b3 -s ours am: 3d121d3920 -s ours am: cf3a5fb7b7 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12079859
Change-Id: I69a6be9f24d751c11dfb4d85ffc1714fd45d4ef4
Diffstat (limited to 'tools/stats_log_api_gen/java_writer.cpp')
0 files changed, 0 insertions, 0 deletions