diff options
author | Xin Li <delphij@google.com> | 2019-10-26 23:14:13 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-10-26 23:14:13 -0700 |
commit | 058be5620e2221ad2d6f09d7202d905be02ba858 (patch) | |
tree | 2d0da7d0460ce47730553090ec27cd65fb8ab460 /tests/Codegen/src/com/android/codegentest/SampleDataClassTest.java | |
parent | 7e2bffda1a58fa276b4152c5fbfef55f63dfa48b (diff) | |
parent | a958184a3147f2a0ee57ebe3549cc41d0b30e80c (diff) |
[automerger skipped] Merge "Merge Coral/Flame into AOSP master" am: b2198fa670 -s ours
am: a958184a31 -s ours
am skip reason: change_id Ibe8ff7bdba7a886bd8b91155ae56f087a836981f with SHA1 af8a6c724f is in history
Change-Id: I92eabc9cf3b76c39eab3cbd1a79572dc34ca0a5e
Diffstat (limited to 'tests/Codegen/src/com/android/codegentest/SampleDataClassTest.java')
0 files changed, 0 insertions, 0 deletions