summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-6.0.0_r26' into cm-13.0HEADreplicant-6.0-0004-transitionreplicant-6.0-0004-rc6replicant-6.0-0004-rc5-transitionreplicant-6.0-0004-rc5replicant-6.0-0004-rc4replicant-6.0-0004-rc3replicant-6.0-0004-rc2replicant-6.0-0004-rc1replicant-6.0-0004replicant-6.0-0003replicant-6.0-0002replicant-6.0-0001stable/cm-13.0-ZNH5Ystable/cm-13.0-ZNH2KBstable/cm-13.0-ZNH2Kstable/cm-13.0-ZNH0Ecm-13.0Ricardo Cerqueira2015-11-050-0/+0
|\
| * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-110-0/+0
| |\
* | \ merge in mnc-release history after reset to mnc-devThe Android Automerger2015-08-110-0/+0
|\ \ \ | |/ / |/| / | |/
| * merge in mnc-release history after reset to mnc-devThe Android Automerger2015-06-100-0/+0
| |\
| | * merge in mnc-release history after reset to mnc-devThe Android Automerger2015-06-090-0/+0
| | |\
| | | * merge in mnc-release history after reset to mnc-devThe Android Automerger2015-06-060-0/+0
| | | |\
| | | | * merge in mnc-release history after reset to mnc-devThe Android Automerger2015-06-040-0/+0
| | | | |\
| | | | | * merge in mnc-release history after reset to mnc-devThe Android Automerger2015-06-020-0/+0
| | | | | |\
| | | | | | * merge in mnc-release history after reset to mnc-devThe Android Automerger2015-05-300-0/+0
| | | | | | |\
| | | | | | | * merge in mnc-release history after reset to mnc-devThe Android Automerger2015-05-230-0/+0
| | | | | | | |\
| | | | | | | | * merge in mnc-release history after reset to mnc-devThe Android Automerger2015-05-120-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in mnc-release history after reset to mnc-devThe Android Automerger2015-05-090-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in mnc-release history after reset to mnc-devThe Android Automerger2015-05-050-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in mnc-release history after reset to mnc-devThe Android Automerger2015-05-020-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in mnc-release history after reset to mnc-devThe Android Automerger2015-04-290-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * am 7114577a: [SetupWizard] Add attributes for illustration sizeJorim Jaggi2015-04-2316-16/+138
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | * \ am a38fab1a: Merge "[SetupWizardLib] Fill viewport on phone portrait" into ub...Maurice Lam2015-04-232-13/+13
| | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | * \ \ am a2ad0846: [SetupWizardLib] Correct accent colorsMaurice Lam2015-04-221-3/+3
| | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | * \ \ \ Merge "Import translations. DO NOT MERGE"Geoff Mendal2015-04-223-0/+18
| | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | * | | | Import translations. DO NOT MERGEGeoff Mendal2015-04-223-0/+18
| | | | | | | | | | | | | * | | | | Import translations. DO NOT MERGEGeoff Mendal2015-04-223-0/+66
| | | | | | | | | | | | | |/ / / /
| | | | | | | | | | | | | * | | | am ef6e202a: Merge "[SetupWizardLib] Update for buildSrc 1.1" into ub-setupwi...Maurice Lam2015-04-211-1/+1
| | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | * \ \ \ \ am 2152fdf0: [SetupWizard] Update dark theme accent colorMaurice Lam2015-04-211-1/+1
| | | | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | | | * \ \ \ \ \ am 30e6ffd2: Merge "[SetupWizardLib] Update theme colors" into ub-setupwizard...Maurice Lam2015-04-161-3/+3
| | | | | | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | | | | * \ \ \ \ \ \ am 0fe74b9f: Merge "[SetupWizardLib] Limit header lines" into ub-setupwizard-...Maurice Lam2015-04-162-1/+33
| | | | | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | | | * \ \ \ \ \ \ \ am 5e79c37f: [SetupWizardLib] Fix shouldMirrorIllustration NPEMaurice Lam2015-04-161-4/+4
| | | | | | | | | | | | | |\ \ \ \ \ \ \ \
| | | | | | | | | | | | | * \ \ \ \ \ \ \ \ am 56a19113: [SetupWizardLib] Add isLightTheme methodMaurice Lam2015-04-082-0/+93
| | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | * \ \ \ \ \ \ \ \ \ am 0d6c44af: Merge "[SetupWizardLib] Adjust immersive flags for dialogs" into...Maurice Lam2015-04-072-8/+38
| | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ am 64158e33: [SetupWizardLib] Fix Partner class and testsMaurice Lam2015-04-073-9/+61
| | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ am d61674ef: [SetupWizardLib] Add progress bar supportMaurice Lam2015-04-0619-62/+345
| | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ am e7b519c1: [SetupWizardLib] Fix nav bar button alphaMaurice Lam2015-04-011-1/+10
| | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | * | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-03-3073-0/+1606
| | | | | | | | | | | | | * | | | | | | | | | | | | | am 83c3c518: [SetupWizardLib] Fix setup wizard crashMaurice Lam2015-03-301-2/+4
| | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 2cd3a505: Merge "[SetupWizardLib] Add isSetupWizard" into ub-setupwizard-a...Maurice Lam2015-03-302-0/+128
| | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 6df73450: [SetupWizardLib] Add standalone build fileMaurice Lam2015-03-303-54/+147
| | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 9f936767: [SetupWizardLib] Eclair compat buildMaurice Lam2015-03-2744-65/+149
| | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am eb0dd6bb: Merge "[SetupWizardLib] Fix back button bug" into ub-setupwizard...Maurice Lam2015-03-262-2/+363
| | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 504a2f6f: Merge "[SetupWizardLib] Add no-scroll templates" into ub-setupwi...Maurice Lam2015-03-258-0/+266
| | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am ad05462a: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-03-250-0/+0
| | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am cbce1423: Merge "[SetupWizardLib] Use AppCompat themes for icsCompat" into...Maurice Lam2015-03-235-31/+65
| | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 2a007876: Merge "[SetupWizardLib] Add getNavigationBar" into ub-setupwizar...Maurice Lam2015-03-232-0/+22
| | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am c7033d3c: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-03-230-0/+0
| | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 779e26ab: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-03-210-0/+0
| | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-03-211-0/+6
| | | | | | | | | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | am a722cfbd: [SetupWizardLib] Flip Illustration for RTL on JBMaurice Lam2015-03-191-12/+21
| | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 2646e1d8: [SetupWizardLib] Changed project hierarchyMaurice Lam2015-03-1885-8/+9
| | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 16a7a7a8: Merge "[SetupWizardLib] Implement Partner" into ub-setupwizard-a...Maurice Lam2015-03-124-0/+387
| | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 97984027: Merge "[SetupWizardLib] Fix tests for tablets" into ub-setupwiza...Maurice Lam2015-03-122-12/+33
| | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 4fe042de: Merge "[SetupWizardLib] Add dist plugin to gradle" into ub-setup...Maurice Lam2015-03-121-0/+1
| | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 62aa3106: [SetupWizardLib] Fix navigation bar themeMaurice Lam2015-03-128-0/+8
| | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \