diff options
| author | Victor Chang <vichang@google.com> | 2016-05-23 11:59:02 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-23 11:59:02 +0000 |
| commit | 8806a4bdc8ce04fd658781498516983d2bef48dc (patch) | |
| tree | 7ad24d77412471fa3d4150adf44c7232be3a9752 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | d755f9b86b5c81c3c0607e78fd0cc2e08c44c304 (diff) | |
| parent | d86ac8116bfc64c61d8124ff8d3e92be5e55cd3e (diff) | |
Merge "New api in LockSettingsService to get StrongAuth synchronously" into nyc-dev
am: d86ac8116b
* commit 'd86ac8116bfc64c61d8124ff8d3e92be5e55cd3e':
New api in LockSettingsService to get StrongAuth synchronously
Change-Id: I07d18fd5c472f1ab3f3ad4c37583e9092f4431b4
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions