diff options
| author | 2017-10-19 02:37:19 +0000 | |
|---|---|---|
| committer | 2017-10-19 02:37:19 +0000 | |
| commit | 7fd4bec14aaf0e3d30eb6546ef7501d38a76d32d (patch) | |
| tree | 9ea86adf4b5f09195f56560b94f9a27db20339e7 /libs/androidfw/AttributeResolution.cpp | |
| parent | 9950579eb5f6adcee14fc35bbc6bdee9535df3b6 (diff) | |
| parent | c6ca9254ed07ff129a4d26c5601f5ebc462ca8dd (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 am: d34366e714 am: 9b0a6a3509 -s ours am: f1a95220a3
am: c6ca9254ed
Change-Id: I8715d787f890827442c098b7ef5c93c563e4246e
Diffstat (limited to 'libs/androidfw/AttributeResolution.cpp')
0 files changed, 0 insertions, 0 deletions