diff options
| author | Zoey Chen <zoeychen@google.com> | 2021-03-01 08:09:34 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-01 08:09:34 +0000 |
| commit | 6794dbe262a1bcebcec168638797a94dfaea892f (patch) | |
| tree | 9a80c2a788582de2632eafd8b158fcdc4553a948 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 4d562f64fd990bf05dd283c6d77194174990793f (diff) | |
| parent | 4d942da6f96e9098eabee78338a52cdcbd6c59d9 (diff) | |
[automerger skipped] Merge "[Telephony] Implement onDataEnabled callback" am: c8057ecd1c am: ce04917626 am: 4d942da6f9 -s ours
am skip reason: Change-Id I1b9fe50e4b805f5117fb6e03438dd0a09fbcfebc with SHA-1 4ad5f0a7c7 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1608055
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I04a1b91748fa0fd6669d5f1b6abcfcda0c5e9bfb
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions