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)
am: 68c8b4ad5d

Change-Id: Ib04b9a3d56e9daf61b299a30e24a3c8839819a00


Trivial merge