diff options
| author | Wei Liu <luciferleo@google.com> | 2016-02-04 18:10:16 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-02-04 18:10:16 +0000 |
| commit | 1886efacfc22aff9e191cd57820c2d151bac66e3 (patch) | |
| tree | ee50551bda5ae44980b1f520c83deec98384ab5c /tools/aapt2/diff/Diff.cpp | |
| parent | 8152fbd7e999fe57f85944a12b281be47fec0a79 (diff) | |
| parent | 4577aac5510db6c3255a5e09a573c52bbfa8b609 (diff) | |
Merge "DO NOT MERGE ANYWHERE Start the FingnerprintService only if it has FEATURE_FINGERPRINT." into cw-e-dev am: fbd88d132e -s ours
am: 4577aac551 -s ours
* commit '4577aac5510db6c3255a5e09a573c52bbfa8b609':
DO NOT MERGE ANYWHERE Start the FingnerprintService only if it has FEATURE_FINGERPRINT.
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions