OSDN Git Service

Merge "Also support 464xlat on SUSPENDED networks"
authorErik Kline <ek@google.com>
Thu, 21 Sep 2017 11:55:35 +0000 (11:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Sep 2017 11:55:35 +0000 (11:55 +0000)
commit69a28066bdf731105c4f52f50ffee32c4350e968
tree22d759cb7b2562e0ad3a6a01bb194a9b34bee19e
parent7a5dd80c9502bad6c98eb61299d8c2168147fd2c
parent995a28d334cded5ed736b69b5ead8bcda4db87e0
Merge "Also support 464xlat on SUSPENDED networks"
am: 995a28d334

Change-Id: Iab87bfcb66e7932d61beec38bcbda366262eab46