tree c81e6cee4d18e04b1252f66882acf99f4e399b88
parent 6d8cffc4e9a7782131b9828fc77e60054875eff2
parent 6f93a6c2c31b7dc45e96624f029398c50b73265f
author Lorenzo Colitti <lorenzo@google.com> 1467855110 +0000
committer android-build-merger <android-build-merger@google.com> 1467855110 +0000

Merge \"Merge \\"Make registerDefaultNetwork work on metered networks.\\" into nyc-dev am: 33cdc4d136  -s ours\" into nyc-mr1-dev
am: 6f93a6c2c3

Change-Id: I160e1a702a5e879da775ddf9e360ef5c3d206973