diff options
| author | Pavel Grafov <pgrafov@google.com> | 2017-08-31 15:48:18 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-08-31 15:48:18 +0000 |
| commit | 1b3a751d23d0533bdbeea45d54e9b67431cece96 (patch) | |
| tree | 8318364fb43c0579c2c28f1bb3a2d631ef53e77c /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | a89ed7a49239efbfa2d8ee1dbb88025bba3f9600 (diff) | |
| parent | 060b87b068315c2936ff15f793ac58d62764c473 (diff) | |
Merge "Unlock managed profile keystore when user is unlocked." into oc-mr1-dev
am: 060b87b068
Change-Id: Ib9b53f97f09dc31563ea53d760067027ac2dde67
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions