diff options
| author | Adrian Roos <roosa@google.com> | 2017-07-31 12:42:13 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-31 12:42:13 +0000 |
| commit | 1ad42266872e44af553c32a950fb002748d1d452 (patch) | |
| tree | ffed28c649bc53ff079eb6baf34bf849b03a8bbf /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 5eca35d4a00faff0485fb1476ff3fb8faf194bc8 (diff) | |
| parent | 13b17b29905c33a370989a80722b2f920aaa4ae5 (diff) | |
Merge "AOD: When prox covered disable touch during pulse instead of aborting" into oc-dr1-dev am: 3cace2a148
am: 13b17b2990
Change-Id: Ib7e303b11b47096daf7216cd6dbd109a047733f9
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions