diff options
| author | Atanas Kirilov <akirilov@google.com> | 2018-06-27 23:29:41 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-06-27 23:29:41 +0000 |
| commit | 8c94fb33e0b65a299516bced51e03438a33f88f0 (patch) | |
| tree | 984add0dbf05af2271d16325b699a8c0ac2c23d5 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | e0f893ebb036ded7acc87523bb68f5dd4d1b4a75 (diff) | |
| parent | c3e741e530072743e667adfd18a7c93bec711704 (diff) | |
Merge changes from topic "am-32ac52b1-d1ae-4650-b9ae-368d8cd519cb" into nyc-mr2-dev
* changes:
[automerger] RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing am: 2f7d50058a am: 06848a3f8f
[automerger] RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing am: 2f7d50058a
RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions