diff options
author | Victor Chang <vichang@google.com> | 2016-05-23 11:58:41 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-05-23 11:58:41 +0000 |
commit | 1e93177121848f337c512b7ce0d06265abb02356 (patch) | |
tree | 63fdd967ed38f5c341c892494206a297c4ee38db /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 38aff6828df4de050b4b9aca80511cfdfb19b939 (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: I3fe13c51d5d33f5689f0b4130a33cf3a2777e186
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions