diff options
| author | Wei Liu <luciferleo@google.com> | 2016-02-04 18:15:26 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-02-04 18:15:26 +0000 |
| commit | 7007254630ef6e8d236bcc2b548a08f34e443061 (patch) | |
| tree | 8200648fc6767908f668f2a7fa076eb13eb1c1d3 /tools/aapt2/diff/Diff.cpp | |
| parent | 7cbc1aeecdb41076e26c2aa70bdc971ddb294e21 (diff) | |
| parent | 1886efacfc22aff9e191cd57820c2d151bac66e3 (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
am: 1886efacfc -s ours
* commit '1886efacfc22aff9e191cd57820c2d151bac66e3':
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