diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2015-01-30 15:54:45 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-01-30 15:54:45 +0000 |
| commit | b6088a80b4c3309cd18f5eb46ecf0614af8339ec (patch) | |
| tree | 4a3454531ca186e6296aef38b1f9865d6bc9a7bc /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | c89cdf2ad435b3b5da16405a0eceb600e93b7a3e (diff) | |
| parent | 786deba636618fcf530e42340b0e5d683c5af74c (diff) | |
Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()" automerge: fba459d
automerge: 786deba
* commit '786deba636618fcf530e42340b0e5d683c5af74c':
Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions