summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | | am 6d449fe9: am 03347bac: Fix issue #7323256: permission dialog has bad layoutDianne Hackborn2012-10-122-11/+20
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / | | | |/| | | | | | |
| | | * | | | | | | | am 03347bac: Fix issue #7323256: permission dialog has bad layoutDianne Hackborn2012-10-112-11/+20
| | | |\ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / | | | | |/| | | | | |
| * | | | | | | | | | am 5e6d24e8: (-s ours) Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-10-110-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-10-110-0/+0
| | |\ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ am 49adc031: (-s ours) am e6e1bc4f: am ba12a2ce: Import translations. DO NOT ...Baligh Uddin2012-10-110-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | am e6e1bc4f: am ba12a2ce: Import translations. DO NOT MERGEBaligh Uddin2012-10-110-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | am ba12a2ce: Import translations. DO NOT MERGEBaligh Uddin2012-10-110-0/+0
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / | | | | |/| | | | | | |
| * | | | | | | | | | | am 0ddcb31c: (-s ours) am 030b2d76: Import translations. DO NOT MERGEBaligh Uddin2012-10-110-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | am 030b2d76: Import translations. DO NOT MERGEBaligh Uddin2012-10-111-1/+1
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-10-101-1/+1
| * | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-10-101-1/+1
| * | | | | | | | | | | am 6260ced1: (-s ours) Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-10-050-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-10-050-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / | | | |/| | | | | | | |
| * | | | | | | | | | | am 5e52a959: (-s ours) am 487f2def: am 4c8e26f7: Import translations. DO NOT ...Baligh Uddin2012-10-050-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | am 487f2def: am 4c8e26f7: Import translations. DO NOT MERGEBaligh Uddin2012-10-050-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | am 4c8e26f7: Import translations. DO NOT MERGEBaligh Uddin2012-10-050-0/+0
| | | |\ \ \ \ \ \ \ \ \
| * | | \ \ \ \ \ \ \ \ \ am a4886874: (-s ours) am 7df08466: Import translations. DO NOT MERGEBaligh Uddin2012-10-050-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | am 7df08466: Import translations. DO NOT MERGEBaligh Uddin2012-10-051-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / /
| | | * | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-10-041-1/+1
| * | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-10-041-1/+1
| * | | | | | | | | | | | am c0381e72: (-s ours) Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-10-020-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-10-020-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ am 4dd5a5d9: (-s ours) am a6ce58d5: am 70021c39: Import translations. DO NOT ...Baligh Uddin2012-10-020-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | am a6ce58d5: am 70021c39: Import translations. DO NOT MERGEBaligh Uddin2012-10-020-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | am 70021c39: Import translations. DO NOT MERGEBaligh Uddin2012-10-020-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \
| * | | \ \ \ \ \ \ \ \ \ \ \ am f8dd1c80: (-s ours) am 308f3e36: Import translations. DO NOT MERGEBaligh Uddin2012-10-020-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | am 308f3e36: Import translations. DO NOT MERGEBaligh Uddin2012-10-021-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / /
| | | * | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-10-011-2/+2
| * | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2012-10-021-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-10-011-2/+2
| * | | | | | | | | | | | | | | am a566ca3a: (-s ours) am fe14070c: am 70731879: Merge "Import translations. ...Baligh Uddin2012-10-010-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | am fe14070c: am 70731879: Merge "Import translations. DO NOT MERGE" into jb-m...Baligh Uddin2012-10-010-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / | | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | | am 70731879: Merge "Import translations. DO NOT MERGE" into jb-mr1-devBaligh Uddin2012-10-010-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | \ \ \ \ \ \ \ \ \ \ \ \ \ am 7f907cfd: (-s ours) am 42958b19: Merge "Import translations. DO NOT MERGE"...Baligh Uddin2012-10-010-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | | | | | / / / / / / / / / / / / | | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | am 42958b19: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-devBaligh Uddin2012-10-011-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / /
| | | * | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-devBaligh Uddin2012-10-011-2/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-09-281-2/+2
| * | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2012-10-011-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-09-281-2/+2
| * | | | | | | | | | | | | | | | | am 9900b586: Merge remote-tracking branch \'goog/jb-mr1-aah-dev\' into HEADJean-Baptiste Queru2012-09-280-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | 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-283-6/+6
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-09-283-6/+6
| | | * | | | | | | | | | | | | | | | am 85a283f2: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2012-09-280-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-271-1/+1
| | | * | | | | | | | | | | | | | | | | | am 4dca31bd: Merge "Update references to migrated global settings." into jb-m...Jeff Brown2012-09-261-2/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d99b9d51: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2012-09-250-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \