diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2015-01-30 15:56:00 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-01-30 15:56:00 +0000 |
| commit | a0057ad69083dc09c0c853fd20119f5a9ea877d9 (patch) | |
| tree | aff55cd3ce84ab58a4096114cce0e45dd5f5582f /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | b6088a80b4c3309cd18f5eb46ecf0614af8339ec (diff) | |
| parent | 5b392ee7584688d6929ca40760d0df2a12bd0b16 (diff) | |
Merge "Also include the domain when parceling StaticIpConfiguration." automerge: c565a56
automerge: 5b392ee
* commit '5b392ee7584688d6929ca40760d0df2a12bd0b16':
Also include the domain when parceling StaticIpConfiguration.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions