diff options
| author | Vinod Krishnan <vinodkrishnan@google.com> | 2015-11-07 09:33:17 -0800 |
|---|---|---|
| committer | Vinod Krishnan <vinodkrishnan@google.com> | 2015-11-07 09:33:17 -0800 |
| commit | 012a557f593bd2862756839eeade4b892b05422e (patch) | |
| tree | 4be83cc28fd7d93f3d193eec2d89bdd977f72dcc /res/layout/header.xml | |
| parent | 914243ab7dd019daa1ae8fcbb538142555597acd (diff) | |
| download | android_packages_apps_PackageInstaller-012a557f593bd2862756839eeade4b892b05422e.tar.gz android_packages_apps_PackageInstaller-012a557f593bd2862756839eeade4b892b05422e.tar.bz2 android_packages_apps_PackageInstaller-012a557f593bd2862756839eeade4b892b05422e.zip | |
resolve merge conflicts of e8c6801367 to cw-e-dev.
Change-Id: I9c5a0be4e18cc27e163da60ba9dd81ae71588bef
Diffstat (limited to 'res/layout/header.xml')
0 files changed, 0 insertions, 0 deletions