diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-04-03 15:16:47 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-04-03 15:16:47 +0000 |
| commit | 46806c75dfd38eb069ecacd71bbfc5ad21ad5caa (patch) | |
| tree | 4f7afdda7520c05cadd7024f801abc99e17d5d34 /tools/aapt2/diff/Diff.cpp | |
| parent | 0a5b54560d233ac87dfbcd5b7ec4916b443a1539 (diff) | |
| parent | c6a25527c484db1e0436a5356efcf35a41d3fed5 (diff) | |
Merge "Allow userActivityTimeout override when keyguard is showing." into rvc-dev
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions