diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-03 17:57:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-06-03 17:57:55 +0000 |
| commit | fd3cd181fdfe3ba32f76eaae3a74ce9d4dee401c (patch) | |
| tree | 44e96d1f2e375d5c12398801111517da34f5acc7 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 21ee4805271c40cbe0c58fc2ef94f1e090239d91 (diff) | |
| parent | d3110f412e8023ac55fbd9400b8a65994bb64f2f (diff) | |
Merge changes from topic "am-8aa3e7d6bc464a7ca8763f06d92f1c24" into rvc-d1-dev-plus-aosp
* changes:
[automerger skipped] Merge "DO NOT MERGE Make intents immutable" into oc-dev am: 1e8240d82f am: 53f1a99fa0 am: 18b5a53447 -s ours am: 0b212d65e1 -s ours am: a9f6ccf964 am: dae7a3468c -s ours am: 6a2eb025f4 am: 1daf6dd2ed
[automerger skipped] DO NOT MERGE Make intents immutable am: dba9823ac7 am: 51ed0f97df am: e0862c053d -s ours am: 5b227475ab -s ours am: c2407e7e8c am: 37ba307e1f -s ours am: e72846f59c am: 140e335708
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions