OSDN Git Service

Merge "Also include the domain when parceling StaticIpConfiguration." automerge:...
authorLorenzo Colitti <lorenzo@google.com>
Fri, 30 Jan 2015 15:56:00 +0000 (15:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 30 Jan 2015 15:56:00 +0000 (15:56 +0000)
commita0057ad69083dc09c0c853fd20119f5a9ea877d9
treeaff55cd3ce84ab58a4096114cce0e45dd5f5582f
parentb6088a80b4c3309cd18f5eb46ecf0614af8339ec
parent5b392ee7584688d6929ca40760d0df2a12bd0b16
Merge "Also include the domain when parceling StaticIpConfiguration." automerge: c565a56
automerge: 5b392ee

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