diff options
| author | Tyler Gunn <tgunn@google.com> | 2020-05-11 22:10:50 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-11 22:10:50 +0000 |
| commit | aa3d7a4cf302a86c65ad5d1101ad6b3b5ea1cee7 (patch) | |
| tree | 82292dc5523bab5e7161a9d9752d2a7be811e409 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | f00f6c21459cb2e11883f10713c2e28ccd3eff70 (diff) | |
| parent | 2827cb98cf4996c5a0d56279fcb126e6700e3484 (diff) | |
[automerger skipped] Merge "Fix parceling and unparceling for URIs in Telecom." am: 68a50c1b2f am: f94ecdc108 -s ours am: bf40121a5a -s ours am: c65606efce -s ours am: 2827cb98cf -s ours
am skip reason: Change-Id I87b881e55a749e0ea46ba3b3c7d297856a744f37 with SHA-1 83d6a74cf0 is in history
Change-Id: I60a491d395e1f9f19a108f3640a3e3b95c2853ad
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions