summaryrefslogtreecommitdiffstats
path: root/libs
diff options
context:
space:
mode:
authorLorenzo Colitti <lorenzo@google.com>2014-09-23 15:50:59 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-09-23 15:50:59 +0000
commit63a8e04d2da0daf6802ecea2048f9eb9a9a8b878 (patch)
tree86a7768d7ff52d094f0ee4bf50084566cd747e9f /libs
parent9b8af6e778c0cf9da6f5bacfdc8687a1af7e18a4 (diff)
parentd94854030c76fc4ee4126ca1707a76fbd1f29126 (diff)
downloadframeworks_native-63a8e04d2da0daf6802ecea2048f9eb9a9a8b878.zip
frameworks_native-63a8e04d2da0daf6802ecea2048f9eb9a9a8b878.tar.gz
frameworks_native-63a8e04d2da0daf6802ecea2048f9eb9a9a8b878.tar.bz2
am d9485403: Merge "Include the VPN server IP address in the VPN state file." into lmp-dev
* commit 'd94854030c76fc4ee4126ca1707a76fbd1f29126': Include the VPN server IP address in the VPN state file.
Diffstat (limited to 'libs')
0 files changed, 0 insertions, 0 deletions