diff options
| author | Ricky Wai <rickywai@google.com> | 2016-05-26 14:35:30 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-26 14:35:30 +0000 |
| commit | e1855ce4925c2c3ebe8cba019be447eac94af7ad (patch) | |
| tree | 6d011148b6e2f8ac9b40b63675c03d0fa33dfdb0 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 4f680d9c78aff68b0d7ebd92b19b5d9e7ee2467f (diff) | |
| parent | 754ddca748d7a8d3e55f4d90c07ca140a7ed312d (diff) | |
Merge "Add resetKeyStore() in LockSettingsService" into nyc-dev am: 1cb6f9d8a4
am: 754ddca748
* commit '754ddca748d7a8d3e55f4d90c07ca140a7ed312d':
Add resetKeyStore() in LockSettingsService
Change-Id: Ic5d0e880c85754a4c198597c80c7eacfa1b1516a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions