diff options
| author | David Stevens <stevensd@google.com> | 2017-08-17 00:13:06 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-08-17 00:13:06 +0000 |
| commit | 70d1217543623676301617567030f6c951fdce7c (patch) | |
| tree | 2957f9e65acb1063835a474ce838770c631d133d /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | cb1bf89eb2d3198af9dab9ec3596efb8343ea451 (diff) | |
| parent | 341cd735cb7ba5d3b2c6f9b17eceef7059e4dc67 (diff) | |
Merge "DO NOT MERGE Let external activities run when the primary display is off" into oc-mr1-dev
am: 341cd735cb
Change-Id: Ibc06854ff0382055f1cff814f2e707531875e714
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions