aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* build: allow to disable recovery-two-step.img generationstaging/cm-14.1_android-7.1.2_r2refs/changes/52/168252/1Flex19112017-04-092-7/+12
* Merge tag 'android-7.1.2_r2' into cm-14.1Dan Pasanen2017-04-0518-84/+436
|\
| * N2G47Egitbuildkicker2017-02-251-1/+1
| * N2G47Dgitbuildkicker2017-02-231-1/+1
| * N2G47Cgitbuildkicker2017-02-171-1/+1
| * N2G47Bgitbuildkicker2017-02-161-1/+1
| * N2G47gitbuildkicker2017-02-161-1/+1
| * merge in nyc-mr2-release history after reset to nyc-mr2-devgitbuildkicker2017-02-160-0/+0
| |\
| | * N2G46gitbuildkicker2017-02-151-1/+1
| | * merge in nyc-mr2-release history after reset to nyc-mr2-devgitbuildkicker2017-02-150-0/+0
| | |\ | |/ /
| | * N2G45gitbuildkicker2017-02-141-1/+1
| | * merge in nyc-mr2-release history after reset to nyc-mr2-devgitbuildkicker2017-02-140-0/+0
| | |\ | |/ /
| | * N2G44gitbuildkicker2017-02-131-1/+1
| | * merge in nyc-mr2-release history after reset to nyc-mr2-devgitbuildkicker2017-02-130-0/+0
| | |\
| | | * N2G43gitbuildkicker2017-02-121-1/+1
| | | * merge in nyc-mr2-release history after reset to nyc-mr2-devgitbuildkicker2017-02-120-0/+0
| | | |\ | | |/ /
| | | * N2G40Bgitbuildkicker2017-02-091-1/+1
| | | * N2G40gitbuildkicker2017-02-091-1/+1
| | | * merge in nyc-mr2-release history after reset to nyc-mr2-devgitbuildkicker2017-02-090-0/+0
| | | |\ | | |/ /
| | | * N2G39gitbuildkicker2017-02-081-1/+1
| | | * merge in nyc-mr2-release history after reset to nyc-mr2-devgitbuildkicker2017-02-080-0/+0
| | | |\ | | |/ /
| | | * N2G38gitbuildkicker2017-02-071-1/+1
| | | * merge in nyc-mr2-release history after reset to nyc-mr2-devgitbuildkicker2017-02-070-0/+0
| | | |\ | | |/ /
| | | * N2G37gitbuildkicker2017-02-061-1/+1
| | | * merge in nyc-mr2-release history after reset to nyc-mr2-devgitbuildkicker2017-02-060-0/+0
| | | |\ | | |/ /
| | | * N2G36gitbuildkicker2017-02-051-1/+1
| | | * merge in nyc-mr2-release history after reset to nyc-mr2-devgitbuildkicker2017-02-050-0/+0
| | | |\ | | |/ /
| | | * N2G33Bgitbuildkicker2017-02-021-1/+1
| | | * N2G33gitbuildkicker2017-02-021-1/+1
| | | * merge in nyc-mr2-release history after reset to nyc-mr2-devgitbuildkicker2017-02-020-0/+0
| | | |\ | | |/ /
| | | * N2G32gitbuildkicker2017-02-011-1/+1
| | | * merge in nyc-mr2-release history after reset to nyc-mr2-devgitbuildkicker2017-02-010-0/+0
| | | |\ | | |/ /
| | | * N2G31gitbuildkicker2017-01-311-1/+1
| | | * merge in nyc-mr2-release history after reset to nyc-mr2-devgitbuildkicker2017-01-310-0/+0
| | | |\ | | |/ /
| | | * N2G30Bgitbuildkicker2017-01-301-1/+1
| | | * N2G30gitbuildkicker2017-01-301-1/+1
| | | * merge in nyc-mr2-release history after reset to nyc-mr2-devgitbuildkicker2017-01-300-0/+0
| | | |\ | | |/ /
| | | * N2G29gitbuildkicker2017-01-291-1/+1
| | | * merge in nyc-mr2-release history after reset to nyc-mr2-devgitbuildkicker2017-01-290-0/+0
| | | |\ | | |/ /
| | | * N2G26gitbuildkicker2017-01-261-1/+1
| | | * merge in nyc-mr2-release history after reset to nyc-mr2-devgitbuildkicker2017-01-260-0/+0
| | | |\ | | |/ /
| | | * N2G25gitbuildkicker2017-01-251-1/+1
| | | * merge in nyc-mr2-release history after reset to nyc-mr2-devgitbuildkicker2017-01-250-0/+0
| | | |\ | | |/ /
| | | * N2G24gitbuildkicker2017-01-241-1/+1
| | | * merge in nyc-mr2-release history after reset to nyc-mr2-devgitbuildkicker2017-01-240-0/+0
| | | |\ | | |/ /
| | | * N2G23gitbuildkicker2017-01-231-1/+1
| | | * merge in nyc-mr2-release history after reset to nyc-mr2-devgitbuildkicker2017-01-230-0/+0
| | | |\ | | |/ /
| | | * N2G22gitbuildkicker2017-01-221-1/+1
| | | * merge in nyc-mr2-release history after reset to nyc-mr2-devgitbuildkicker2017-01-220-0/+0
| | | |\ | | |/ /
| | | * N2G19gitbuildkicker2017-01-191-1/+1