diff options
author | Amith Yamasani <yamasani@google.com> | 2017-08-30 01:17:34 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-08-30 01:17:34 +0000 |
commit | 6e1a98ddd1948dd9876ce9f3e834a36adf0c318c (patch) | |
tree | 956c724a2653104013779aa37581b9d44ed1651e /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | e154c72e85decf02cba41fcbf9fba5fa79d46517 (diff) | |
parent | eb7b0393047669f5e80cddb9273af157c36c8521 (diff) |
Merge "Screen-pinning unpin security fails for secondary user. DO NOT MERGE" into oc-mr1-dev
am: eb7b039304
Change-Id: Icc808587e11431ba869718732909b65203eca010
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions