diff options
| author | Bryce Lee <brycelee@google.com> | 2017-08-18 21:40:44 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-08-18 21:40:44 +0000 |
| commit | 004f9a3066bc1be589a6c98855ff1232f1c6c024 (patch) | |
| tree | 1039e791f9aaeb26a86ef2f27bbc37cc8e4b4f06 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 4558b89ca29b59b509d7648cde37b294ea340574 (diff) | |
| parent | 1327cdc53de0d557bddeac8dabd07a2d197def3b (diff) | |
Merge "Don't resume activity if user is locked and encryption is unsupported" into oc-mr1-dev
am: 1327cdc53d
Change-Id: I18e0a89f4afcdaa61da289566c275a29dadc9c28
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions