tree 3a5c9c6dc299819de04cee113981e12a81b7a65c
parent a4d49ce7f7904fbe6b684934b3a9297fcd20e383
parent 844709958d3e0991af56e977e2a57b6c2771d4bc
author Pavel Maltsev <pavelm@google.com> 1527878100 -0700
committer android-build-merger <android-build-merger@google.com> 1527878100 -0700

[automerger skipped] Merge "Add missing features to static IP config" am: 5a4b8793d4
am: 844709958d  -s ours

Change-Id: I145c2a63f0fce4d527d19d35949bdd938df3991e