diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2015-01-23 06:06:57 +0000 | 
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-01-23 06:06:57 +0000 | 
| commit | 6840ffae6761b369992fceb6b880cd9cd600b136 (patch) | |
| tree | d68d1b88e1fe18888d93c4e102ed279d8b43c00b /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | e03f2cb2c26d30c277d38566976bb4b00326d465 (diff) | |
| parent | fbaf6b353dc9b7218b340acf629b06ae8e0101bb (diff) | |
am 78d51c22: Merge "Use the proper IpPrefix and LinkAddress constructors in VPN code." into lmp-mr1-dev
automerge: fbaf6b3
* commit 'fbaf6b353dc9b7218b340acf629b06ae8e0101bb':
  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
