summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | | | | | | | | | Merge remote-tracking branch 'goog/jb-mr1-aah-dev' into HEADJean-Baptiste Queru2012-09-280-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | am 8b163990: Merge "Determine the originating uid for an install" into jb-mr1...Ben Gruver2012-09-282-2/+84
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-devBaligh Uddin2012-09-273-6/+6
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-09-273-6/+6
| | | * | | | | | | | | | | | | | | | am 85a283f2: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2012-09-270-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | am 86095920: Fix issue #7240599 Permissions UI: left side padding on...Dianne Hackborn2012-09-275-6/+44
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 6213650e: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2012-09-270-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-09-261-1/+1
| | | * | | | | | | | | | | | | | | | | | am 4dca31bd: Merge "Update references to migrated global settings." into jb-m...Jeff Brown2012-09-251-2/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d99b9d51: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2012-09-250-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-09-251-10/+5
| | | * | | | | | | | | | | | | | | | | | | | am 0973f642: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2012-09-210-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-devBaligh Uddin2012-09-2120-200/+100
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-09-2120-200/+100
| | | * | | | | | | | | | | | | | | | | | | | | | am f9e9a151: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2012-09-210-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-09-2021-210/+105
| | | * | | | | | | | | | | | | | | | | | | | | | am 8e766155: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2012-09-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am ec75fbc7: Merge "Allow side-loading of apps from other users." into jb-mr1...Dianne Hackborn2012-09-203-21/+69
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am b1775959: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2012-09-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-09-196-60/+30
| | | * | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-09-1849-8/+498
| | | * | | | | | | | | | | | | | | | | | | | | | | | | am be389122: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2012-09-170-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | am 41860fb9: am 8b163990: Merge "Determine the originating uid for an install...Ben Gruver2012-09-282-2/+84
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | am 8b163990: Merge "Determine the originating uid for an install" into jb-mr1...Ben Gruver2012-09-282-2/+84
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | am 2633ebc9: (-s ours) am 85a283f2: Import translations. DO NOT MERGEBaligh Uddin2012-09-280-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | am 85a283f2: Import translations. DO NOT MERGEBaligh Uddin2012-09-273-6/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | am 9085b7a6: am 86095920: Fix issue #7240599 Permissions UI: left side paddin...Dianne Hackborn2012-09-285-6/+44
| |\| | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | am 86095920: Fix issue #7240599 Permissions UI: left side padding on...Dianne Hackborn2012-09-275-6/+44
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-09-273-6/+6
| * | | | | | | | | | | | | | | | | | | | | | | | | | | am c6ce71ba: (-s ours) am 6213650e: Import translations. DO NOT MERGEBaligh Uddin2012-09-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | am 6213650e: Import translations. DO NOT MERGEBaligh Uddin2012-09-271-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-09-261-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | am 4dc3b164: (-s ours) Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-09-260-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-09-260-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | am 1485060f: am 4dca31bd: Merge "Update references to migrated global setting...Jeff Brown2012-09-251-2/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | am 4dca31bd: Merge "Update references to migrated global settings." into jb-m...Jeff Brown2012-09-251-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | am 3c9904e5: (-s ours) am d99b9d51: Import translations. DO NOT MERGEBaligh Uddin2012-09-250-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | am d99b9d51: Import translations. DO NOT MERGEBaligh Uddin2012-09-251-10/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-09-251-10/+5
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | am a550c990: (-s ours) Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-09-240-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-09-240-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 1b4d6b56: (-s ours) am 0973f642: Import translations. DO NOT MERGEBaligh Uddin2012-09-240-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | am 0973f642: Import translations. DO NOT MERGEBaligh Uddin2012-09-2120-200/+100
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-09-2120-200/+100
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2012-09-2021-210/+105
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-09-2021-210/+105
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am cc32a932: (-s ours) am f9e9a151: Import translations. DO NOT MERGEBaligh Uddin2012-09-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | am f9e9a151: Import translations. DO NOT MERGEBaligh Uddin2012-09-2021-210/+105
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | am a0ee2087: (-s ours) Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-09-200-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-09-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \