diff options
| author | 2017-10-19 01:48:33 +0000 | |
|---|---|---|
| committer | 2017-10-19 01:48:33 +0000 | |
| commit | d34366e714216ea06192d563cc9b98a03101cabd (patch) | |
| tree | 1acefac006e5f72b7be101808e673ee4018c79b6 /libs/androidfw/AttributeResolution.cpp | |
| parent | c26e04b0065b83c6f98429de90d8241cb6aee91f (diff) | |
| parent | 3d600ede6d64b630870d7e45df437927088eb55a (diff) | |
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev am: e1adf2240f -s ours am: 3ca0cc0ae6 -s ours am: 01ae445966
am: 3d600ede6d
Change-Id: Ibc39fe483882017cbd47733259bd04eb30b187f3
Diffstat (limited to 'libs/androidfw/AttributeResolution.cpp')
0 files changed, 0 insertions, 0 deletions