OSDN Git Service

Merge "Nat464Xlat: internal state guards cleanup + state enum" am: aee703e7e4 am...
authorHugo Benichi <hugobenichi@google.com>
Mon, 28 Aug 2017 23:12:13 +0000 (23:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 28 Aug 2017 23:12:13 +0000 (23:12 +0000)
commit15dd2c92ef0e791a85cde71d842bdfff96eadb3a
treefc544d3635bdeb4ae6ea09cb8d2f63c1f075db11
parentf3956afd10f775987a34a4bad1798ddf50f27687
parent68c8b4ad5d468d7b4907fa1458984025853a2bec
Merge "Nat464Xlat: internal state guards cleanup + state enum" am: aee703e7e4 am: 20d4df8cc1
am: 68c8b4ad5d

Change-Id: Ib04b9a3d56e9daf61b299a30e24a3c8839819a00