diff options
| author | Erik Kline <ek@google.com> | 2017-06-21 13:29:48 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-06-21 13:29:48 +0000 |
| commit | 3245530ba18413b17e340970f1a9ecc9f841a44d (patch) | |
| tree | 97acd9258e550f8885547c6b36e91a763c1f6261 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | d2cc32bcdef5feefb42b3897cfd7efbed1728eff (diff) | |
| parent | 592e85b4fdbf423d7afa32eb69c7fbae2dd960b4 (diff) | |
Merge "Always allow Ethernet to be an upstream" into oc-dr1-dev
am: 592e85b4fd -s ours
Change-Id: I3bdfdb50557093b906a92ccebec2212274f9f255
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions