diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-09-05 23:39:21 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-09-05 23:39:21 +0000 |
| commit | 471a4e60764e704bf2b977a6e11c0c89a6b4f37a (patch) | |
| tree | d53c15490d8c8629a4ba905e14c752d014cf87e2 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 08d2780e1e2cac0f75721ac59c74a62bbc96de27 (diff) | |
| parent | 270e8c4c4ae47a00e539bc46b6d772ba7ed081e7 (diff) | |
Merge changes from topic "am-51363a78-f167-48aa-956c-f9bfd551a3a5" into oc-dev
* changes:
[automerger skipped] Hide overlay windows when requesting media projection permission. skipped: 5c3f5a02bd skipped: 3eb97a9bd9 skipped: 50f6c53a1a skipped: defeb8c596 skipped: 6619efdd68
[automerger skipped] Hide overlay windows when requesting media projection permission. skipped: 5c3f5a02bd skipped: 3eb97a9bd9 skipped: 50f6c53a1a skipped: defeb8c596
[automerger skipped] Hide overlay windows when requesting media projection permission. skipped: 5c3f5a02bd skipped: 3eb97a9bd9 skipped: 50f6c53a1a
[automerger skipped] Hide overlay windows when requesting media projection permission. skipped: 5c3f5a02bd skipped: 3eb97a9bd9
[automerger skipped] Hide overlay windows when requesting media projection permission. skipped: 5c3f5a02bd
Hide overlay windows when requesting media projection permission.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions