diff options
| author | Svetoslav <svetoslavganov@google.com> | 2015-11-20 15:11:31 -0800 |
|---|---|---|
| committer | Svetoslav <svetoslavganov@google.com> | 2015-11-20 15:11:31 -0800 |
| commit | b11aef442f414e38f76a7faba573683d362b3c0f (patch) | |
| tree | 82f59ef7e6bdca86dbdd052e11601a633fac6c4a /src/com/android/packageinstaller/permission/ui/PermissionsFrameFragment.java | |
| parent | 06225387771dfeb2cb53cc2914ee8ba54ff5bcf6 (diff) | |
| parent | 56ac33bf1e57858d0b442dc4cf935aa0c1ddb931 (diff) | |
| download | android_packages_apps_PackageInstaller-b11aef442f414e38f76a7faba573683d362b3c0f.tar.gz android_packages_apps_PackageInstaller-b11aef442f414e38f76a7faba573683d362b3c0f.tar.bz2 android_packages_apps_PackageInstaller-b11aef442f414e38f76a7faba573683d362b3c0f.zip | |
resolve merge conflicts of 56ac33bf1e to master.
Change-Id: I1439964d551cdc6b829fc99edd8b2c138dc1abf5
Diffstat (limited to 'src/com/android/packageinstaller/permission/ui/PermissionsFrameFragment.java')
0 files changed, 0 insertions, 0 deletions