diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-06-10 17:03:13 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-10 17:03:13 +0000 |
| commit | 7151f089b82f1af158b2dcaff7ba16b03abeac3c (patch) | |
| tree | 324b7e6dda69d1afbfb0566f9d5365ce4e6d89b5 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 8c7cb70a76683e25bba80248cf7ca38ce12b99ab (diff) | |
| parent | f8c6eb678ba7c7d9be2b04179fabcf3ad649227a (diff) | |
[automerger skipped] Merge "API: Remove ViewDebug.ExportedProperty and CapturedViewProperty from current.txt" am: 274911fd70 am: f8c6eb678b -s ours
am skip reason: Change-Id I99ed93e96f7465f1f7c9a32c3715a874055dc809 with SHA-1 7e703b445e is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1325822
Change-Id: I87eecdb282236086de3ae2d3ecf1effc6206855c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions