OSDN Git Service

Merge changes I4d985a27,Ic6f2bc18
authorLorenzo Colitti <lorenzo@google.com>
Tue, 23 Jan 2018 00:28:39 +0000 (00:28 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 23 Jan 2018 00:28:39 +0000 (00:28 +0000)
commit9c93808e5ecdd040605e0472d2838a369b1d3e9f
tree8047c5f5b26777fca7299222a6ffa574a44472b7
parent42c76f9cf8d13d5c540a441ab70d6c3af566f4f9
parent53ba2f0c12e816a08b0fb737ef651a340a5ed0a4
Merge changes I4d985a27,Ic6f2bc18

* changes:
  Add metered, roaming, and defaultNetwork info to NetworkTemplate.
  Unbreak frameworks-net tests broken by missing libutilscallstack.