tree cbd41c7d27412ac5d48f914998a24a528ec2b960
parent 6c05f1a03d8168954dd36593cb96777169815926
parent e6793f2795e9b7df5dc68e8ebb420ba228964f61
author Hugo Benichi <hugobenichi@google.com> 1504614608 +0000
committer android-build-merger <android-build-merger@google.com> 1504614608 +0000

Merge "Nat464Xlat: correct racefree teardown"
am: e6793f2795

Change-Id: I8612db5e5050690db8cf41dd04944b4c22da340c