OSDN Git Service

Merge "Support NAT keepalives" into oc-mr1-dev
authorErik Kline <ek@google.com>
Thu, 7 Sep 2017 12:46:12 +0000 (12:46 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 7 Sep 2017 12:46:12 +0000 (12:46 +0000)
commit4fae111ca244714ddfae75f6f6afa0f4e5dfa36f
treef44424537cc5c1199eefd0a6dcb8892dc0ff15da
parentb6a1c5f06bb6f19dfecfbd77548096a3f7523075
parent7a65bc62fbe0391f88834ab27b32033d6b957c8b
Merge "Support NAT keepalives" into oc-mr1-dev