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