summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am fffd02e9: (-s ours) am a8497f6f: (-s ours) Reconcile with jb-mr1-release -...jb-mr1.1-devJean-Baptiste Queru2013-03-110-0/+0
|\
| * am a8497f6f: (-s ours) Reconcile with jb-mr1-release - do not mergeJean-Baptiste Queru2013-03-110-0/+0
|/|
| * Reconcile with jb-mr1-release - do not mergejb-mr1-devJean-Baptiste Queru2013-03-110-0/+0
| |\
| | \
| \ \
*-. \ \ Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergeandroid-cts-4.2_r2The Android Open Source Project2012-11-060-0/+0
|\ \ \ \ | |_|/ / |/| | / | | |/
| | * merge in jb-mr1-release history after reset to jb-mr1-devandroid-cts-4.2_r1android-4.2_r1android-4.2.1_r1.2android-4.2.1_r1.1android-4.2.1_r1jb-mr1-releaseThe Android Automerger2012-11-020-0/+0
| |/| |/| |
| | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-110-0/+0
| | |\
| | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-110-0/+0
| | | |\
* | | | | Fix issue #7448596: Can't uninstall app that was installed by another userandroid-sdk-support_r11Dianne Hackborn2012-10-312-1/+5
| |/ / / |/| | |
| * | | merge in jb-mr1-factory-release history after reset to jb-mr1-devThe Android Automerger2012-10-120-0/+0
|/| | |
| * | | merge in jb-mr1-factory-release history after reset to jb-mr1-devThe Android Automerger2012-10-110-0/+0
| |\ \ \ | | |/ / | |/| / | | |/
| | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-050-0/+0
| | |\
| | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-020-0/+0
| | | |\
| | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-300-0/+0
| | | | |\
| | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-280-0/+0
| | | | | |\
| | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-260-0/+0
| | | | | | |\
| | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-220-0/+0
| | | | | | | |\
| | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-210-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-200-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-180-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-170-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-160-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-130-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-220-0/+0
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * Revert "Accept and pass URLs to PackageManagerService"Rich Cannings2012-08-082-17/+2
* | | | | | | | | | | | | | | | Fix issue #7323256: permission dialog has bad layoutDianne Hackborn2012-10-112-11/+20
|/ / / / / / / / / / / / / / /
* / / / / / / / / / / / / / / Import translations. DO NOT MERGEBaligh Uddin2012-10-101-1/+1
|/ / / / / / / / / / / / / /
* / / / / / / / / / / / / / Import translations. DO NOT MERGEBaligh Uddin2012-10-041-1/+1
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-10-011-2/+2
* | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into jb-mr1-devBaligh Uddin2012-10-011-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-09-281-2/+2
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge "Determine the originating uid for an install" into jb-mr1-devBen Gruver2012-09-282-2/+84
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Determine the originating uid for an installBen Gruver2012-09-272-2/+84
| |/ / / / / / / / / /
* | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-09-273-6/+6
* | | | | | | | | | | Fix issue #7240599 Permissions UI: left side padding on...Dianne Hackborn2012-09-275-6/+44
* | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-09-261-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge "Update references to migrated global settings." into jb-mr1-devJeff Brown2012-09-251-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update references to migrated global settings.Jeff Brown2012-09-251-2/+2
| |/ / / / / / / / /
* / / / / / / / / / Import translations. DO NOT MERGEBaligh Uddin2012-09-251-10/+5
|/ / / / / / / / /
* / / / / / / / / Import translations. DO NOT MERGEBaligh Uddin2012-09-2120-200/+100
|/ / / / / / / /
* / / / / / / / Import translations. DO NOT MERGEBaligh Uddin2012-09-2021-210/+105
|/ / / / / / /
* | | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-09-196-60/+30
* | | | | | | Merge "Allow side-loading of apps from other users." into jb-mr1-devDianne Hackborn2012-09-193-21/+69
|\ \ \ \ \ \ \
| * | | | | | | Allow side-loading of apps from other users.Dianne Hackborn2012-09-193-21/+69
| |/ / / / / /
* / / / / / / Import translations. DO NOT MERGEBaligh Uddin2012-09-181-1/+1
|/ / / / / /
* / / / / / Import translations. DO NOT MERGEBaligh Uddin2012-09-1749-7/+497
|/ / / / /
* / / / / Implement new option for uninstalling over all users.Dianne Hackborn2012-09-163-2/+15
|/ / / /
* / / / Further adjustment of the new package installer UI.Dianne Hackborn2012-09-165-62/+223
|/ / /
* / / New permissions UI.Dianne Hackborn2012-09-123-76/+224
|/ /
* | am 47fe118e: Merge "Show a Toast on a successful application uninstall"Dianne Hackborn2012-08-211-1/+7
|\ \
| * \ Merge "Show a Toast on a successful application uninstall"tools_r21Dianne Hackborn2012-08-211-1/+7
| |\ \