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