commit | 728dace14d83e87e777ceaaf3dfd031cf3502f80 | [log] [tgz] |
---|---|---|
author | Lorenzo Colitti <lorenzo@google.com> | Fri Jan 30 15:59:49 2015 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jan 30 15:59:49 2015 +0000 |
tree | 54f7f318d2f354566aad35f6424968ceb7c6171d | |
parent | c519b8042f08a07449a3861c791afe12619b28a0 [diff] | |
parent | a0057ad69083dc09c0c853fd20119f5a9ea877d9 [diff] |
Merge "Also include the domain when parceling StaticIpConfiguration." automerge: c565a56 automerge: 5b392ee automerge: a0057ad * commit 'a0057ad69083dc09c0c853fd20119f5a9ea877d9': Also include the domain when parceling StaticIpConfiguration.