diff options
| author | Rubin Xu <rubinxu@google.com> | 2018-05-09 09:20:25 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-05-09 09:20:25 -0700 |
| commit | 08a353550581cee89ea8f5b7fa92668ef9ee3b37 (patch) | |
| tree | b4b27b888bd2b25366cb2d9d1eb8767f1de56030 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | b220d235295c9e9f1e61b962119ef04615171816 (diff) | |
| parent | 54a514eda04fe8765ab3e93e5b84b790e21cf179 (diff) | |
Merge "Allow profile owner to disable iris/face on personal keyguard" into pi-dev
am: 54a514eda0
Change-Id: I8516f3ffa4c655195da3863d6ac23ab52af4ef70
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions