diff options
author | Selim Cinek <cinek@google.com> | 2019-10-28 14:06:35 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-10-28 14:06:35 -0700 |
commit | 233ae5002feee23fa563c219b57910fa83bf1e90 (patch) | |
tree | acb73eda44b5d26c2020edb5f3fd8c19957ba6bf /tests/Codegen/src/com/android/codegentest/SampleWithNestedDataClasses.java | |
parent | 2e133ae3930988babf5f9611c3a8dea485c96a5d (diff) | |
parent | db59aba5947a97da3e6e07ccd3e132e7d30664d4 (diff) |
[automerger skipped] Merge "DO NOT MERGE Revert all scrim related changes in qpr" into qt-qpr1-dev am: 39195ba211
am: db59aba594 -s ours
am skip reason: subject contains skip directive
Change-Id: I178eca4ce0739bfbc2d49c0f85654dc14a805a93
Diffstat (limited to 'tests/Codegen/src/com/android/codegentest/SampleWithNestedDataClasses.java')
0 files changed, 0 insertions, 0 deletions