OSDN Git Service

Merge "Also support 464xlat on SUSPENDED networks" am: 995a28d334 am: 69a28066bd...
authorErik Kline <ek@google.com>
Thu, 21 Sep 2017 12:10:40 +0000 (12:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Sep 2017 12:10:40 +0000 (12:10 +0000)
commit6498a4b82d0d49057648b074a00c7e5fb465c34c
treeadf39a20691f3aaf3349fa9d3be3dd10f0250e14
parent5fdb88c70a32dbd8e24c498b7358a46c3cb8cbba
parent573959665979f60fc526f0d2e9851e275fe508e6
Merge "Also support 464xlat on SUSPENDED networks" am: 995a28d334 am: 69a28066bd am: 1347ac8109
am: 5739596659

Change-Id: Iacc209990bd7be57578bc52c9f57c63e0540209e