diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2009-11-24 09:37:33 -0800 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2009-11-24 09:37:33 -0800 |
| commit | 579d418db016a9ae87479da9e29d8827474d68f5 (patch) | |
| tree | cf0c0dc604734220ead0a5ac8939f9c3d8614225 /packages/VpnServices | |
| parent | 5ec498b39c978c0e297d44d6670b27a41124d40b (diff) | |
| parent | f5f38bec1a1c40fbe717f1aabe85e18e21c03810 (diff) | |
| download | frameworks_base-579d418db016a9ae87479da9e29d8827474d68f5.zip frameworks_base-579d418db016a9ae87479da9e29d8827474d68f5.tar.gz frameworks_base-579d418db016a9ae87479da9e29d8827474d68f5.tar.bz2 | |
resolved conflicts for merge of f5f38bec to master
Diffstat (limited to 'packages/VpnServices')
0 files changed, 0 insertions, 0 deletions