diff options
| author | Elliott Hughes <enh@google.com> | 2014-04-28 13:58:46 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2014-04-28 13:58:46 -0700 |
| commit | 3a203e4a58bf5ee03c3303df6a04e43a4eefb1eb (patch) | |
| tree | 20e96ac964fa3c7ec6a639ef81086abc741606e2 /tests | |
| parent | 8b36635d727451930ef4939aad25148c05c66b09 (diff) | |
| parent | 3b0c40cfc0048db9b0bcadabae802446e7667588 (diff) | |
| download | android_packages_providers_DownloadProvider-3a203e4a58bf5ee03c3303df6a04e43a4eefb1eb.tar.gz android_packages_providers_DownloadProvider-3a203e4a58bf5ee03c3303df6a04e43a4eefb1eb.tar.bz2 android_packages_providers_DownloadProvider-3a203e4a58bf5ee03c3303df6a04e43a4eefb1eb.zip | |
resolved conflicts for merge of 3b0c40cf to master
Change-Id: I9e3b0735950cb1e495ecd58590b5d6e1f253bc88
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions