diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-05-19 04:22:52 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-19 04:22:52 +0000 |
| commit | 0fef58a53449d3a72aae43b6fcb1d42fe24eecba (patch) | |
| tree | 23acbd7d38c837081f485574613dc4ddb6f60173 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 0690cbc74a6a006ea5f09f85b19c180ac4d1755a (diff) | |
| parent | 9a790742bc77814cfd0006f6647e9f7084d9ffd9 (diff) | |
[automerger skipped] Merge "Prevent recursive calls to proximity sensor." into rvc-d1-dev am: 6aae8bdf1c am: d8430ea7d1 -s ours am: 9a790742bc -s ours
am skip reason: Change-Id I8be62222c4e2b586218696b1d8b6ac158ebeffb5 with SHA-1 209e793a0b is in history
Change-Id: Ic63aba0cee0b04c2043f4456aa710c7cec2c49ed
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions
