diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-06-16 12:03:42 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-16 12:03:42 +0000 |
commit | 0e1e1b8cebea0eb305a5af1f1cc4fc155a07c86d (patch) | |
tree | 3d9fc8a0dc48301a6e347d498ea5b75016a51431 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 753af5a6d68c781ae30402fc6683e9e36bbae1bb (diff) | |
parent | 933e578ef55adf4c80a9f03d20278cecb36b3f63 (diff) |
[automerger skipped] Merge "services/backup/OWNERS: Sync with internal version." am: 9cc2f77917 am: 26a6905fae -s ours am: 4275518955 -s ours am: 933e578ef5 -s ours
am skip reason: Change-Id I42c27dfc0f3f792c46fe60e0f6807e51a2c3f21e with SHA-1 a7fcdc930e is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1337176
Change-Id: I96bea8f02b4563891eb3b78087cecfa81f3f08b0
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions