tree c58f593d2114aa11c95e87de74b90d1ea2a05249
parent 1edc73aa5dc24db39ec685f1950c5110699e301e
parent 93e4192c06a28f37bc1c16b280fbd22c735b5c92
author Jeff Davidson <jpd@google.com> 1417831570 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1417831572 +0000

Merge "add disable Ephemeral Network API Bug:18525241" into lmp-mr1-dev