tree 735bd388fb2528e52f4545594e94165adcc8fd2a
parent 6d1bbbcd40896df25b865808a044e9f2c1b9f88b
parent 4c8d7a04019fbd4f97e0a83ae0ffe6e595815a5e
author Vadim Tryshev <vadimt@google.com> 1555961440 -0700
committer android-build-merger <android-build-merger@google.com> 1555961440 -0700

Merge "Adopt shell permission only to set and unset time limit." into ub-launcher3-qt-dev
am: 4c8d7a0401

Change-Id: Id226c9a9acbc9f9daba7d5eccc6f6bf407649626