diff options
author | Adrian Roos <roosa@google.com> | 2017-07-31 12:36:21 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-07-31 12:36:21 +0000 |
commit | 86e49f224c9e80ba4c89ac5e9705ff3e015579ca (patch) | |
tree | ce7c0a76f549862fdd3b37b0b8a62a79d4090baa /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | b10ffae3cb77efffd03f614f1622a68d1134c9b1 (diff) | |
parent | 3cace2a1482784ace8b8f732bfbb646b9ef612df (diff) |
Merge "AOD: When prox covered disable touch during pulse instead of aborting" into oc-dr1-dev
am: 3cace2a148
Change-Id: Ia30c3884751a44392efb843a2da41a0528162fa2
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions