diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2018-01-23 17:14:03 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-01-23 17:14:03 +0000 |
| commit | 15e76d620a93eb3a0377da59fdb366b87714f2a1 (patch) | |
| tree | bef34cb8d5b52612e9de064aa386795619858c5f /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | e74fa6c23145a64ae7c15821c6e27458c51c50b4 (diff) | |
| parent | e2ad37f9bc4778bfad97881e5fbd7b45ea162863 (diff) | |
Merge changes I2b6bfca0,I9a854d43
* changes:
Add option to retrieve pending intent result
Fix issue with permission check for shortcuts and pendingIntent
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions