diff options
| author | Nataniel Borges <natanieljr@google.com> | 2021-10-08 08:51:10 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-10-08 08:51:10 +0000 |
| commit | 2461e951b9b83c9ef975626de41a4b00855a8735 (patch) | |
| tree | 6a5be2121013cd634a0d89d81a34d050e7512aa1 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 0234494d3227a2ed1d8522eb9ff945a772aceb45 (diff) | |
| parent | 732fa80c97b822cea1fcf957da303d1069a7f030 (diff) | |
Merge changes from topic "sync-flicker-sc-v2-dev" into sc-v2-dev
* changes:
[DO NOT MERGE] Dump windowing mode in Winscope traces
[DO NOT MERGE] Dump SurfaceControl's layerId to proto
[DO NOT MERGE] Dump WindowContainer SurfaceControls to proto
[DO NOT MERGE] Expose SurfaceControl's native mLayerId property to Java
[DO NOT MERGE] Sync flicker from master to sc-v2
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions