diff options
| author | Ricky Wai <rickywai@google.com> | 2016-05-26 14:03:51 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-26 14:03:51 +0000 |
| commit | 9b22e5b4e80e9daadf2af6430607016839e1909c (patch) | |
| tree | 5d1ab076a603a3c32ef3edee03981e379919ed76 /tools/aapt2/diff/Diff.cpp | |
| parent | 56181175a7717dc1d8ea58cdd2ecdcb252119304 (diff) | |
| parent | 1cb6f9d8a4827d50e26bf83068a928e47c5c1f1e (diff) | |
Merge "Add resetKeyStore() in LockSettingsService" into nyc-dev
am: 1cb6f9d8a4
* commit '1cb6f9d8a4827d50e26bf83068a928e47c5c1f1e':
Add resetKeyStore() in LockSettingsService
Change-Id: I0125a334fac098183e68fa0b9cd24bda64a88fae
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions