diff options
| author | Serik Beketayev <serikb@google.com> | 2020-12-25 09:45:54 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-25 09:45:54 +0000 |
| commit | 40e7949c5f64676ffe6a992fdaddd04a64e549d4 (patch) | |
| tree | 8cfd43477a884ccdd980ce49164706e54ad0e136 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 0b39593d11e1346e9ef216a625bf1745eeafe090 (diff) | |
| parent | 5565118666481fcb6da80efb4c5eec03368ff70f (diff) | |
Merge "[Mainline] Migrate ProxyInfo" am: 3c3711dffd am: 5565118666
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1506616
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ica0e0965296e3bf843fa73fc6d687da6a9ae721d
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions