diff options
| author | Kevin Chyn <kchyn@google.com> | 2017-08-15 19:49:36 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-08-15 19:49:36 +0000 |
| commit | 2356e497410e8722e8dc91fd74cac79a56c9fa14 (patch) | |
| tree | c09291bbc07e5a4c495680d5785ccb6f45c91ca8 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 1606d2162bfd01ed7b7dd31721f333fc9d04bc2e (diff) | |
| parent | b79536e0a70844f341257191a6a4a6ee1957e88b (diff) | |
Merge "Only auth via FP when device is locked, when Assistant is on top" into oc-mr1-dev am: 990d25bda0
am: b79536e0a7
Change-Id: I9e60b61c5141f4e58dbed3a1c7f450f7932acf9f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions