| commit | faa0492d6ba7e9262741c50695997c6c231023e4 | [log] [tgz] |
|---|---|---|
| author | Pavel Zhamaitsiak <pavelz@google.com> | Tue Apr 05 04:34:50 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Apr 05 04:34:50 2016 +0000 |
| tree | c4e3adb48b928261f681c9aa31d216c167a9ade5 | |
| parent | 2e6eeed7d321f468f9434927f0ca433926044bec [diff] | |
| parent | f8565cd3f30c60d8343dae3ca8c8bca18c5b451a [diff] |
Merge "resolve merge conflicts of 20ebbb3 to nyc-dev" into nyc-dev am: f8565cd * commit 'f8565cd3f30c60d8343dae3ca8c8bca18c5b451a': ConnectivityMetricsLogger: Switch to "pull" model Change-Id: Ic01fa847282f4d8b37c85c1b877a85df73401200