diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2016-04-25 14:35:00 -0600 |
|---|---|---|
| committer | Jeff Sharkey <jsharkey@android.com> | 2016-04-25 14:35:00 -0600 |
| commit | 5210cd471512336a99a327e87160a518857fab35 (patch) | |
| tree | b938426523f4b654219fd97bfcd4c62ffcdf9210 /docs | |
| parent | d12dd16fd9ebe0dbbb4d95ee75292d8516204e8e (diff) | |
| parent | 3a5f5eafb34eaa4963c801882148e8f61514a61b (diff) | |
| download | android_packages_providers_DownloadProvider-5210cd471512336a99a327e87160a518857fab35.tar.gz android_packages_providers_DownloadProvider-5210cd471512336a99a327e87160a518857fab35.tar.bz2 android_packages_providers_DownloadProvider-5210cd471512336a99a327e87160a518857fab35.zip | |
resolve merge conflicts of 3a5f5ea to nyc-dev-plus-aosp
Change-Id: Ib1bf6fc558789dcf9bcf81cea19e551ca9b49642
Diffstat (limited to 'docs')
0 files changed, 0 insertions, 0 deletions