diff options
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2018-10-19 16:55:02 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-10-19 16:55:02 +0000 |
| commit | 7a1b30e9db4c73e9109e99fc8cdaeafbb8218709 (patch) | |
| tree | 6bf6ee128e0774d9ec5c2c0ccf9c075decf37251 /tools/stats_log_api_gen/Collation.cpp | |
| parent | 94da0e40af03c7666ee9cc46a17d11cbb23dfcce (diff) | |
| parent | 47d413df18181a225f4e4741aafd83d6f96cbaa4 (diff) | |
Merge changes from topic "am-7f0575b5d09641f7a3715eefeb61bed8"
* changes:
Merge "Add tests for the network blocked status change" am: af0de1a2e9 am: 43d8774f68 am: 9944d7f079
Merge "Add new callback to inform blocking of network on specific uid." am: f709e754ab am: 745952eac8 am: 70626e3b94
Diffstat (limited to 'tools/stats_log_api_gen/Collation.cpp')
0 files changed, 0 insertions, 0 deletions