diff options
| author | 2016-10-31 04:16:48 +0000 | |
|---|---|---|
| committer | 2016-10-31 04:16:51 +0000 | |
| commit | 7072f32b32e1104a4127fdada87f298bee1b07ff (patch) | |
| tree | 7ff619ac45b9b4ec1e9e1889cabdb9aea293469d /libs/androidfw/AssetManager.cpp | |
| parent | 37c20a369c3e695ed248724ef8ae110ecf180c8a (diff) | |
| parent | ecc986d430f4b8158f177ed97d2edb741f11ff71 (diff) | |
Merge changes from topic 'frameworks-net-tests'
* changes:
Move the connectivity tests to frameworks/base/tests/net.
De-guava BroadcastInterceptingContext and move it to testutils.
Move FakeSettingsProvider to a common location.
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions