diff options
author | Matt Pietal <mpietal@google.com> | 2020-06-22 17:35:54 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-22 17:35:54 +0000 |
commit | ccb7801722c7db57aea7de13d8df041bbeea3552 (patch) | |
tree | aeed08e08113ee558c442fd8be5e6e80c27a0d87 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 78a68c7d5293dabc8682e7c4367cde1c1a47a66c (diff) | |
parent | c38d8f0bf1be70ad6b60b05cd05b891fb35658d6 (diff) |
Merge "Controls UI - Show timeout msg and not controls on error" into rvc-dev am: cde9d6b37f am: c38d8f0bf1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11941804
Change-Id: I25db131c13d88aab866ea0b7cc3b0ac4bcf07de5
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions