tree 502c549ec22f151cffe6a4fefb34d6d35f34b92a
parent 4fa01870157dc5c372bc7ce61d7aec2215737047
parent c6a9b5564a066164ea9e09616fd45f1e94d305b0
author Hugo Benichi <hugobenichi@google.com> 1503317948 +0000
committer android-build-merger <android-build-merger@google.com> 1503317948 +0000

Merge "IpManager: use InitialConfiguration for provisioning" am: 5b218bdc8e
am: c6a9b5564a

Change-Id: I6e42d26ae430c213f65e466a2c556760ff0e14eb