diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-05 12:33:54 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-05 12:33:54 +0000 |
| commit | df2002e56d8b4511b1f2193a7476dd5de48ce56f (patch) | |
| tree | 5a3857a04923f0ea39cb63db54392ccf5b92ec46 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | e79019393ace0111999f1a52174ba9540f9630a8 (diff) | |
| parent | eeb878fd416c0b80c8c709fb307087db76eb3022 (diff) | |
[automerger skipped] Merge "Add setSubscriptionPlans() and getSubscriptionPlans() @SystemApi" am: 12aeaefeaf am: 5b9370b4c8 am: eeb878fd41 -s ours
am skip reason: Change-Id I9f1168bbc70dce9b2b107e1f946737b1d85599c7 with SHA-1 58d9559369 is in history
Change-Id: I99dc8defe78a613bcdecaa6ac7cf47744dc3428d
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions