diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2015-01-23 06:10:48 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-01-23 06:10:48 +0000 |
| commit | e871f0176d035fe28665972097c14d899fd0b47a (patch) | |
| tree | a0bce9a0035e28503b10585dac1e6d1fd0884d12 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | f0ab37c2b980c496594f496e7b5e12f543485670 (diff) | |
| parent | 6840ffae6761b369992fceb6b880cd9cd600b136 (diff) | |
am 78d51c22: Merge "Use the proper IpPrefix and LinkAddress constructors in VPN code." into lmp-mr1-dev automerge: fbaf6b3
automerge: 6840ffa
* commit '6840ffae6761b369992fceb6b880cd9cd600b136':
Use the proper IpPrefix and LinkAddress constructors in VPN code.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions