diff options
author | Jim Miller <jaggies@google.com> | 2016-06-08 00:38:31 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-06-08 00:38:31 +0000 |
commit | 2cf5b73c0a0e277d64874fcff3db27741b8e9808 (patch) | |
tree | eaf6fc3f4666ed903aa485c6278614edb2f1574a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 514c1ae4c651ff402fb3d657654c25afecaad4ef (diff) | |
parent | 4401e24add2b33caaafcd21567184b955ab2654d (diff) |
Merge \"Move legacy full disk encryption code to Settings.\" into nyc-dev
am: 4401e24add
Change-Id: Ic10c6505e4583f487a41eb659227b955013949b7
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions