tree 54f7f318d2f354566aad35f6424968ceb7c6171d
parent c519b8042f08a07449a3861c791afe12619b28a0
parent a0057ad69083dc09c0c853fd20119f5a9ea877d9
author Lorenzo Colitti <lorenzo@google.com> 1422633589 +0000
committer android-build-merger <android-build-merger@google.com> 1422633589 +0000

Merge "Also include the domain when parceling StaticIpConfiguration." automerge: c565a56 automerge: 5b392ee
automerge: a0057ad

* commit 'a0057ad69083dc09c0c853fd20119f5a9ea877d9':
  Also include the domain when parceling StaticIpConfiguration.