OSDN Git Service

Merge "Also support 464xlat on SUSPENDED networks" am: 995a28d334
authorErik Kline <ek@google.com>
Thu, 21 Sep 2017 12:02:07 +0000 (12:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Sep 2017 12:02:07 +0000 (12:02 +0000)
am: 69a28066bd

Change-Id: I960a8976abfebc6741a5982c749c8e428a675990


Trivial merge