diff options
| author | Tyler Gunn <tgunn@google.com> | 2020-08-12 20:07:06 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-12 20:07:06 +0000 |
| commit | c3eedf624a712dc6bb7f28e599680d0572951366 (patch) | |
| tree | 57ad53a09f97455883aa59273e6af9f7284e7c5a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 30cb5db7e3e4a7bd6ce001e3fedd82df78d2f675 (diff) | |
| parent | e21caff62a6c426b2b523f09db7bb5280babe320 (diff) | |
[automerger skipped] Merge "Fix createLaunchEmergencyDialerIntent API behavior when Telecom unavailable." am: 419c0fa22e am: e3051550fd -s ours am: 52bf8ea08e -s ours am: 1c0e198f55 -s ours am: e21caff62a -s ours
am skip reason: Change-Id I1665d456dace8e41cc035e792f319d98dd07219c with SHA-1 28ba067389 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1392010
Change-Id: I4fca0945456e01026c3ca41fa24901a553b7c0af
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions