aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Merge remote-tracking branch 'remotes/quic/caf/github/master' into tip"HEADreplicant-6.0-0004-rc2replicant-6.0-0004-rc1replicant-6.0-0003replicant-6.0-0002replicant-6.0-0001staging/cm-12.1staging/cm-12.0-cafstable/cm-13.0-ZNH5Ystable/cm-13.0-ZNH2KBstable/cm-13.0-ZNH2Kstable/cm-13.0-ZNH0Estable/cm-12.1-YOG7Dstable/cm-12.1-YOG4Pstable/cm-12.1-YOG3Cstable/cm-12.0-YNG4Nstable/cm-12.0-YNG3Cstable/cm-12.0-YNG1TAstable/cm-12.0-YNG1Tstable/cm-12.0-YNG1Icm-13.0cm-12.1cm-12.0Linux Build Service Account2014-08-279-288/+94
|\
| * Merge remote-tracking branch 'remotes/quic/caf/github/master' into tippramod kotreshappa2014-08-269-288/+94
| |\ |/ /
| * Release version 4.0.0ANT-Shane2014-08-255-226/+33
| * Fix Android L 'Duplicate Permission' errorANT-Shane2014-08-201-12/+0
| * Release v3.2.0ANT-Shane2014-01-245-51/+62
* | Merge "Merge remote-tracking branch 'remotes/quic/caf/github/master' into local"Linux Build Service Account2013-11-273-19/+11
|\ \
| * \ Merge remote-tracking branch 'remotes/quic/caf/github/master' into localBhakthavatsala Raghavendra2013-11-223-19/+11
| |\ \ |/ / / | | _
| * Updating Version to 3.1.1ANT-Shane2013-11-182-4/+10
| * Disable requiresBluetoothOn for all platformsBeenish Khurshid2013-11-161-15/+1
* | Merge "Merge branch 'caf' into tip"Linux Build Service Account2013-09-045-42/+436
|\ \
| * \ Merge branch 'caf' into tipSatish kumar sugasi2013-09-045-42/+436
| |\ \ |/ / / | | _
| * Android_System_ANTHALService_3-1-0Khurshid2013-07-194-77/+115
| * Merge branch 'master' of github.com:ant-wireless/Android_ANTHALServiceKhurshid2013-07-190-0/+0
| |\
| | * Merge pull request #3 from bkhurshi/masterbkhurshi2013-07-185-2/+160
| | |\
| * | | Android_System_ANTHALService_3-0-1Khurshid2013-07-193-3/+201
| | |/ | |/|
| * | ANTDROID-1987: Enable Bluetooth when ANT is enabled if required by chip.Khurshid2013-07-185-2/+160
| |/
* | Merge "Merge remote-tracking branch 'remotes/quic/caf/github/master' into tip"Linux Build Service Account2013-02-222-188/+45
|\ \
| * \ Merge remote-tracking branch 'remotes/quic/caf/github/master' into tipSatish kumar sugasi2013-02-222-188/+45
| |\ \ |/ / / | | _
| * Pull in Android_System_Package_3-0-0Rohan Martin2013-02-202-188/+45
* | Merge "Merge remote-tracking branch 'remotes/origin/caf/github/master'"Linux Build Service Account2012-12-1423-0/+2011
|\ \
| * \ Merge remote-tracking branch 'remotes/origin/caf/github/master'Satish kumar sugasi2012-12-0923-0/+2011
| |\ \ |/ / / | | _
| * Merge pull request #2 from rohan-martin/masterRohan Martin2012-12-064-50/+291
| |\
| | * Pull in Android_System_ANTHALService_2-1-0Rohan Martin2012-12-062-3/+3
| | * Merge pull request #1 from rohan-martin/dsicvsRohan Martin2012-11-173-49/+290
| | |\
| | | * Pull in Android_System_ANTHALService_2-0-1Rohan Martin2012-11-173-49/+290
| | |/
| * | Merge pull request #1 from rohan-martin/masterRohan Martin2012-11-0222-0/+1752
| |\ \ | | |/
| | * Broke Android_System_package in to individual repositoriesRohan Martin2012-11-0122-0/+1752
| |/
| * Initial commitRohan Martin2012-11-012-0/+18
* Initial empty repositoryGit User Service Account2012-12-070-0/+0