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