diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2015-09-03 06:39:47 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-03 06:39:47 +0000 |
| commit | 1c9d55411633d6f0af415247c710fdcbac02b1bb (patch) | |
| tree | 2ebb9fc1ddaff76265b8bba40b6fe94afdad06b5 /tools/aapt2/diff/Diff.cpp | |
| parent | 22b507a1eaeec2e8d91f55fa7711d489289cfc5b (diff) | |
| parent | d05c6dd38c8212ab033c839124952d8450ddc0af (diff) | |
am d05c6dd3: am b991034d: am ac2b543b: am 304e3772: Merge "Fix wrong mode for fingerprint unlock when bouncer not showing" into mnc-dr-dev
* commit 'd05c6dd38c8212ab033c839124952d8450ddc0af':
Fix wrong mode for fingerprint unlock when bouncer not showing
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions
