diff options
| author | Ricky Wai <rickywai@google.com> | 2016-05-26 14:51:20 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-26 14:51:20 +0000 |
| commit | f7a58e292c16907290d8f3724b33483c4a2e7127 (patch) | |
| tree | cd186047860ab98235dc2b445fd6b9831dec79c7 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 269c138bc539d63cb7df3b3315f1511f16971f46 (diff) | |
| parent | 1db5fc9810c412aafcfe430285943c6797e8e3fc (diff) | |
Merge "Merge "Add resetKeyStore() in LockSettingsService" into nyc-dev am: 1cb6f9d8a4 am: 754ddca748" into nyc-mr1-dev-plus-aosp
am: 1db5fc9810
* commit '1db5fc9810c412aafcfe430285943c6797e8e3fc':
Add resetKeyStore() in LockSettingsService
Change-Id: Ia3a5c7156fd7774bffa8e4b5ad4d81b36e408923
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions