diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-12-30 12:43:12 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-30 12:43:12 +0000 |
| commit | b59ffd74d5c14bfdc47479503e52ae1f637c0c28 (patch) | |
| tree | 23bf744da381315f26099e86da62d75bf6aa9820 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 39e0d7e4e0d1509efdf71f33195d0ed099a96a20 (diff) | |
| parent | 4a1148442a093691982f6f86b2939cbcbd3c46e1 (diff) | |
[automerger skipped] Merge "Use a randomly generated UUID as the TvInputSessionId" am: 4249ba1059 am: 0578400adb am: 4a1148442a -s ours
am skip reason: Change-Id I4369e2645b50d44803f2d393798fa5ea6d1c22bd with SHA-1 028023b9a0 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536949
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib2bed8b78025bc1cf09aee4a42455b6941628bbf
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions