diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2015-08-20 02:25:02 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-20 02:25:02 +0000 |
| commit | 7de9fbca0bf968aa4dfa48be042bb45f77fed081 (patch) | |
| tree | 885b4bd879d0d2d1eec8a61eb08d2ca83972a559 /tools/aapt2/diff/Diff.cpp | |
| parent | a2737beea11455c48b719c6d2f26d5908d4b8cd2 (diff) | |
| parent | 2364af2083f4f0b00ae8275aed1aeb4193f4b89d (diff) | |
am 2364af20: Merge "Save interactive/screen-on state in KeyguardServiceDelegate" into mnc-dr-dev
* commit '2364af2083f4f0b00ae8275aed1aeb4193f4b89d':
Save interactive/screen-on state in KeyguardServiceDelegate
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions