diff options
| author | Nick Kralevich <nnk@google.com> | 2014-03-14 19:32:15 -0700 |
|---|---|---|
| committer | Nick Kralevich <nnk@google.com> | 2014-03-14 19:32:15 -0700 |
| commit | b9e36b4f5390c9100d567cbe6e61a3304e37e680 (patch) | |
| tree | b183df935bd645c93e4b86069e1ee5bffb2c03aa /ui/res | |
| parent | f5d88b498c309782f9bf71650d972f8bbb784d98 (diff) | |
| parent | 2ca55fd39b9b8a750e77ef4db4ee946fa03442ac (diff) | |
| download | android_packages_providers_DownloadProvider-b9e36b4f5390c9100d567cbe6e61a3304e37e680.tar.gz android_packages_providers_DownloadProvider-b9e36b4f5390c9100d567cbe6e61a3304e37e680.tar.bz2 android_packages_providers_DownloadProvider-b9e36b4f5390c9100d567cbe6e61a3304e37e680.zip | |
resolved conflicts for merge of 2ca55fd3 to master
Change-Id: I59df74b902c95299ae9adda2ddddb6bad4260159
Diffstat (limited to 'ui/res')
0 files changed, 0 insertions, 0 deletions