diff options
author | Hongwei Wang <hwwang@google.com> | 2019-07-30 10:33:09 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-07-30 10:33:09 -0700 |
commit | bbdfc57b21c8a3a3a05c47d45c54833700cc8145 (patch) | |
tree | 96db079cfad5649b247f77783f08d03ed3d765c7 /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | 4d68b649791dfd495023b16624df01e03216427c (diff) | |
parent | 307f77889b000e180a500a89aee8d485e09aca33 (diff) |
Merge "Merge "Allow resume of parent activity that launches PiP" into qt-r1-dev am: 2c89115cb7 am: eaf0683981" into qt-qpr1-dev-plus-aosp
am: 307f77889b
Change-Id: Iac13194dbcfe362eb53abbf490594663c660c228
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions