tree 4ce4db6deff60cfa650ac783097ba607ff72f0f2
parent a119b38d9e8452ac69776998220814ed8f82f2b1
parent 02f6cfa49e21e61149222fc050c7a4642b0c8d77
author Hugo Benichi <hugobenichi@google.com> 1503984698 +0000
committer android-build-merger <android-build-merger@google.com> 1503984698 +0000

Merge "Nat464Xlat: interface notification handler on ConnectivityService" am: 91817b3129
am: 02f6cfa49e

Change-Id: Ib224392c9a185f6bd79fd60cd5cb5549f2a7851e