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)
commit1347ac810918e7db158f459824d372a2e96d4ee5
tree45a23cf70b57a3b2f06ab6064e8af56d1d9b3077
parentcf0c15b54dcef16952413f69e9bc7763d312fcde
parent69a28066bdf731105c4f52f50ffee32c4350e968
Merge "Also support 464xlat on SUSPENDED networks" am: 995a28d334
am: 69a28066bd

Change-Id: I960a8976abfebc6741a5982c749c8e428a675990