diff options
| author | Siyamed Sinir <siyamed@google.com> | 2017-09-12 00:45:19 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-09-12 00:45:19 +0000 |
| commit | b2ba32be690d47712d709223bd9ce6cb34980d70 (patch) | |
| tree | fdd08fa37b7373733309ac133516dd8fe6c2c422 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 846a46043c31ccb6845f01dcaa77ae4f3730b8a3 (diff) | |
| parent | 7359d93942e702ede04fe39f57f6b13c1d2b2bb9 (diff) | |
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am: 06183a57a6 am: 028ad8d498 am: 6352ced635 am: 064bfd22be am: 8393b54d3e am: 954b6e9b74 am: 5288fcc242 am: 4d91e69c82
am: 7359d93942 -s ours
Change-Id: I87dd0675b05119a349887e534ec639fc798709e3
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions