diff options
| author | Todd Kennedy <toddke@google.com> | 2016-01-08 14:45:26 -0800 |
|---|---|---|
| committer | Todd Kennedy <toddke@google.com> | 2016-01-08 14:45:26 -0800 |
| commit | 34b5068c8df2e08c347b598bb9fe83514eb73c7a (patch) | |
| tree | f9b4c9e6f715177799b37d3fbd88f78e2ee719f9 /res | |
| parent | aacb5c145dc3097de8aa1ec6a669e51fcef27676 (diff) | |
| parent | 3296a7a755b8b9028123091ac9094cdc400ee490 (diff) | |
| download | android_packages_apps_PackageInstaller-34b5068c8df2e08c347b598bb9fe83514eb73c7a.tar.gz android_packages_apps_PackageInstaller-34b5068c8df2e08c347b598bb9fe83514eb73c7a.tar.bz2 android_packages_apps_PackageInstaller-34b5068c8df2e08c347b598bb9fe83514eb73c7a.zip | |
resolve merge conflicts of 3296a7a755 to master.
Change-Id: Iac7671a92bc5853d7d8348416cfad09b425e31e8
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions