OSDN Git Service

Merge "Nat464Xlat: internal state guards cleanup + state enum" am: aee703e7e4
authorHugo Benichi <hugobenichi@google.com>
Mon, 28 Aug 2017 23:01:36 +0000 (23:01 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 28 Aug 2017 23:01:36 +0000 (23:01 +0000)
commit68c8b4ad5d468d7b4907fa1458984025853a2bec
treec90ac5300a7da3eb818f65597961f5200f4ab129
parent1190da1b1e7a470f4ab7994e57c512becaa86752
parent20d4df8cc1b42f915e4ab964f9f4fdc374b37aa0
Merge "Nat464Xlat: internal state guards cleanup + state enum" am: aee703e7e4
am: 20d4df8cc1

Change-Id: Ic2246a97618c596dbdbf48cda39c2f5b66e3bfb6