| commit | 60aa10869cb99b5c7f8711aeb6e223a688195336 | [log] [tgz] |
|---|---|---|
| author | Pavel Zhamaitsiak <pavelz@google.com> | Tue Apr 05 04:39:19 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Apr 05 04:39:19 2016 +0000 |
| tree | 575a65ba11f43bf4df8ffb250c4cd019c7348a4a | |
| parent | b6b16990e7af3bb9322e7088b1dee8d68ad63e36 [diff] | |
| parent | faa0492d6ba7e9262741c50695997c6c231023e4 [diff] |
Merge "resolve merge conflicts of 20ebbb3 to nyc-dev" into nyc-dev am: f8565cd am: faa0492 * commit 'faa0492d6ba7e9262741c50695997c6c231023e4': ConnectivityMetricsLogger: Switch to "pull" model Change-Id: Ia5b0fde3c46bb34e8c2308eb8c7ec8af4d600558