summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop' of https://github.com/smartdevicelink/sdl_android into...feature/android_studioJoey Grover2016-09-01200-1633/+6677
|\
| * Merge pull request #326 from smartdevicelink/feature/router_version_passbackJoey Grover2016-08-093-8/+16
| |\
| | * Add router service version to register client responsefeature/router_version_passbackJoey Grover2016-07-283-8/+16
| |/
| * Merge pull request #312 from smartdevicelink/bugfix/issue_311Joey Grover2016-07-287-76/+239
| |\
| | * Merge branch 'develop' of https://github.com/smartdevicelink/sdl_android into...Joey Grover2016-07-2829-968/+588
| | |\ | | |/ | |/|
| * | Merge pull request #323 from thomasheike/patch-2Joey Grover2016-07-271-1/+1
| |\ \
| | * | Fixed ClassCastException in openConnectionThomas Heike2016-07-071-1/+1
| * | | Merge pull request #320 from smartdevicelink/bugfix/issue_319Joey Grover2016-07-131-4/+3
| |\ \ \
| | * | | Give return Class correct parameterized typebugfix/issue_319Joey Grover2016-07-061-1/+1
| | * | | Fixes #319Joey Grover2016-07-061-4/+3
| | |/ /
| * | | Merge pull request #318 from smartdevicelink/bugfix/issue_309Joey Grover2016-07-1321-926/+0
| |\ \ \
| | * | | Fix #309 removes HelloSdl projectbugfix/issue_309Joey Grover2016-07-0621-926/+0
| | |/ /
| * | | Merge pull request #317 from smartdevicelink/feature/update_proxy_builder_multiJoey Grover2016-07-131-2/+22
| |\ \ \
| | * | | Added new constructor to handle multiplexing as default transport.feature/update_proxy_builder_multiJoey Grover2016-07-051-2/+22
| | |/ /
| * | | Merge pull request #316 from smartdevicelink/bugfix/issue_313Joey Grover2016-07-131-8/+501
| |\ \ \
| | * | | Fixes #313bugfix/issue_313Joey Grover2016-07-051-8/+501
| * | | | Merge pull request #322 from smartdevicelink/bugfix/issue_321Joey Grover2016-07-131-2/+2
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Fixes #321bugfix/issue_321Joey Grover2016-07-071-2/+2
| |/ / /
| * | | Merge pull request #314 from smartdevicelink/bugfix/issue_310Joey Grover2016-07-052-2/+2
| |\ \ \
| | * | | Fixes #310bugfix/issue_310Joey Grover2016-06-282-2/+2
| * | | | Merge pull request #306 from smartdevicelink/bugfix/issue_303Joey Grover2016-07-051-1/+4
| |\ \ \ \
| | * | | | Fixes #303bugfix/issue_303Joey Grover2016-06-211-1/+4
| * | | | | Merge pull request #304 from smartdevicelink/bugfix/issue_213Joey Grover2016-07-051-4/+43
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Fixes #213bugfix/issue_213Joey Grover2016-06-211-4/+43
| | |/ / /
| * | | | Merge pull request #286 from smartdevicelink/feature/improved_resume_with_dataJoey Grover2016-06-281-8/+8
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Made changes to better handle app resumption with data persistence to key off...feature/improved_resume_with_dataMarkos Rapitis2016-02-041-8/+8
| | | | * Removed handler leak suppression and did things the right waybugfix/issue_311Joey Grover2016-07-271-8/+20
| | | | * Rename method to find out if router service has a transport connecitonJoey Grover2016-07-271-1/+1
| | | | * Removed debug log statementJoey Grover2016-07-111-1/+0
| | | | * Refactored conneciton code from router to clients.Joey Grover2016-06-274-24/+20
| | | | * Removal of deprecated shared prefs mode, fixes #311Joey Grover2016-06-246-61/+225
| | |_|/ | |/| |
| * | | Merge pull request #250 from smartdevicelink/feature/documentation-updateJoey Grover2016-06-22169-597/+5842
| |\ \ \ | | |_|/ | |/| |
| | * | Merge branch 'develop' of https://github.com/smartdevicelink/sdl_android into...Joey Grover2016-06-2267-1381/+8259
| | |\ \ | | |/ / | |/| |
| | * | Added more comments for video streaming methods.feature/documentation-updateMarkos Rapitis2015-10-231-0/+18
| | * | Merge branch 'develop' into feature/documentation-updateRapitis, Markos (M.J.)2015-10-149-142/+235
| | |\ \
| | * | | fixed a problem from git automerge on inline docsMarkos Rapitis2015-09-281-3/+1
| | * | | added project.properitesRapitis, Markos (M.J.)2015-09-251-0/+12
| | * | | updated docsRapitis, Markos (M.J.)2015-09-2539-528/+2086
| | |\ \ \
| | * | | | updated documentationfeature/ongoing-docsHansenKirk2015-09-25129-1193/+1196
| | * | | | Merge branch 'github/develop' into feature/UpdatedDocsMarkos Rapitis2015-08-1237-2846/+633
| | |\ \ \ \
| | * | | | | removed special charactersvirat-shukla2015-07-2413-73/+73
| | * | | | | Updated documentation for Java docsAnil Dahiya2015-07-16136-115/+5340
* | | | | | | Added maven deployJoey Grover2016-06-211-0/+81
* | | | | | | Added bintray options to gradle fileJoey Grover2016-06-161-0/+23
* | | | | | | Update gradle files for use with Android StudioJoey Grover2016-06-166-1/+309
|/ / / / / /
* | | | | | Merge branch 'master' into developJoey Grover2016-06-151-1/+1
|\ \ \ \ \ \
| * | | | | | Update README.mdCorey Maylone2016-06-091-1/+1
* | | | | | | Merge pull request #78 from smartdevicelink/feature/multiplexingJoey Grover2016-06-1461-1203/+7983
|\ \ \ \ \ \ \
| * | | | | | | Keeps track of HashIds per session to use in case of binder dyingfeature/multiplexingJoey Grover2016-06-141-6/+43
| * | | | | | | Merge branch 'develop' of https://github.com/smartdevicelink/sdl_android into...Joey Grover2016-06-0910-39/+58
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |