diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2014-10-16 18:35:14 +0000 | 
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-16 18:35:14 +0000 | 
| commit | 5fa2929f161164c8040a1b1ab35b04d43de6374c (patch) | |
| tree | 31126d23df087c7e306cd2537bb27512ce1d2320 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 31e4eeb26f2c843d141f969271cff8e825909788 (diff) | |
| parent | 24f9a26cea200d9452bd922d94f8669d87744f53 (diff) | |
am 24f9a26c: am 28dcf034: Merge "Propagate network state changes to the LockdownVpnTracker." into lmp-dev
* commit '24f9a26cea200d9452bd922d94f8669d87744f53':
  Propagate network state changes to the LockdownVpnTracker.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions
