OSDN Git Service

Merge "add disable Ephemeral Network API Bug:18525241" into lmp-mr1-dev
authorJeff Davidson <jpd@google.com>
Sat, 6 Dec 2014 02:06:10 +0000 (02:06 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sat, 6 Dec 2014 02:06:12 +0000 (02:06 +0000)
commita4144563a5bd0e0be4a97fa6e89be6fb455da372
treec58f593d2114aa11c95e87de74b90d1ea2a05249
parent1edc73aa5dc24db39ec685f1950c5110699e301e
parent93e4192c06a28f37bc1c16b280fbd22c735b5c92
Merge "add disable Ephemeral Network API Bug:18525241" into lmp-mr1-dev