| commit | 28b8883c008a09bde32a4a47d97eee78188bd06d | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Fri Jul 01 15:12:52 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jul 01 15:12:53 2016 +0000 |
| tree | 29f2eaacc27e0dc3e64169ee063d903ae921b3e8 | |
| parent | 27bec9b4301671db663bfaafa5b67ba72ba1b5d6 [diff] | |
| parent | 4be10a245ce355d84d70e61cb63d29ed525b478a [diff] |
Merge changes from topic 'networkrequest_private' into nyc-mr1-dev * changes: Keep ConnectivityServiceMock in sync with reality. Keep telephony mocks in sync with NetworkRequest changes.