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 | 75b5dc8fb91c69cb4d94274dc4e6f5a6aaeb457d (patch) | |
| tree | 6908964db77b7e36d6373097db9a20ac6fe29e0e /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 3d38ba1f9bb53c3695a27f242feb28a3f5e56040 (diff) | |
| parent | 06848a3f8fa0b815d13d339c676191f6ebc50d33 (diff) | |
Merge changes from topic "am-32ac52b1-d1ae-4650-b9ae-368d8cd519cb" into cw-f-dev
* changes:
[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_test.cpp')
0 files changed, 0 insertions, 0 deletions