summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 9329e4f0ad20a44cad77ba5cf128f...The Android Automerger2014-10-060-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 7fb913fe2c83e04ebf48759747794...The Android Automerger2014-10-050-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 21af667faeba1e626e79eb823ea60...The Android Automerger2014-10-040-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 221b154a72d436f4c5de22fbdfbc1...The Android Automerger2014-10-020-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 221b154a72d436f4c5de22fbdfbc1...The Android Automerger2014-10-010-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/|
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 91909fae54217a8f9c17e7c1fecef...The Android Automerger2014-09-300-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 91909fae54217a8f9c17e7c1fecef...The Android Automerger2014-09-290-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/|
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 91909fae54217a8f9c17e7c1fecef...The Android Automerger2014-09-280-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/|
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 91909fae54217a8f9c17e7c1fecef...The Android Automerger2014-09-270-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/|
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 91909fae54217a8f9c17e7c1fecef...The Android Automerger2014-09-250-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/|
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 91909fae54217a8f9c17e7c1fecef...The Android Automerger2014-09-240-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/|
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 91909fae54217a8f9c17e7c1fecef...The Android Automerger2014-09-230-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/|
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 7c4d38c43e85914996a83a365ebca...The Android Automerger2014-09-230-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 7c4d38c43e85914996a83a365ebca...The Android Automerger2014-09-220-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/|
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 7c4d38c43e85914996a83a365ebca...The Android Automerger2014-09-220-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/|
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 7c4d38c43e85914996a83a365ebca...The Android Automerger2014-09-220-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Set revision number to 1 for system images" into lmp-mr1-devbohu2015-02-136-6/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set revision number to 1 for system imagesbohu2015-02-126-6/+6
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 47ebdd97: am 2c47fd48: Update build-tools version. DO NOT MERGE.Xavier Ducrohet2015-02-051-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 2c47fd48: Update build-tools version. DO NOT MERGE.Xavier Ducrohet2015-02-051-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update build-tools version. DO NOT MERGE.Xavier Ducrohet2015-02-021-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stop living in the past.Sam Hasinoff2015-01-269-9/+9
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resolved conflicts for merge of 748fb34d to lmp-mr1-devDeepanshu Gupta2015-01-060-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 8d10f2de: Update SDK Pkg revision for API 21 to 3 [DO NOT MERGE]Deepanshu Gupta2015-01-051-3/+3
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update SDK Pkg revision for API 21 to 3 [DO NOT MERGE]Deepanshu Gupta2014-12-311-3/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reset SDK Platform Pkg revision for API 22Deepanshu Gupta2014-12-301-3/+3
| | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a button to the debug app to call reportBadNetwork.Lorenzo Colitti2014-12-173-0/+24
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 011c1614: am 65c18817: am 20d72ce3: Increment lmp-docs samples to revision...Trevor Johns2014-12-161-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 65c18817: am 20d72ce3: Increment lmp-docs samples to revision 5 (DO NOT ME...Trevor Johns2014-12-131-1/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 20d72ce3: Increment lmp-docs samples to revision 5 (DO NOT MERGE)Trevor Johns2014-12-131-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increment lmp-docs samples to revision 5 (DO NOT MERGE)Trevor Johns2014-12-121-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 2f3095d9: am cee6440c: am babfe028: Add new samples to sdk.atreeTrevor Johns2014-12-161-0/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am cee6440c: am babfe028: Add new samples to sdk.atreeTrevor Johns2014-12-121-0/+4
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am babfe028: Add new samples to sdk.atreeTrevor Johns2014-12-121-0/+4
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new samples to sdk.atreeTrevor Johns2014-12-111-0/+4
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add test case for multiple row horizontal grid view" into lmp-mr1-devDake Gu2014-12-114-2/+208
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add test case for multiple row horizontal grid viewDake Gu2014-12-114-2/+208
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 2452c088: am 82365c20: am abededd8: Docs: Sync browseable samples for lmp-...Trevor Johns2014-12-10503-2690/+8907
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 82365c20: am abededd8: Docs: Sync browseable samples for lmp-docsTrevor Johns2014-12-10503-2690/+8907
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am abededd8: Docs: Sync browseable samples for lmp-docsTrevor Johns2014-12-10503-2690/+8907
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Sync browseable samples for lmp-docsTrevor Johns2014-12-09503-2690/+8907
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add RowsFragment example" into lmp-mr1-devDake Gu2014-12-097-11/+258
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add RowsFragment exampleDake Gu2014-12-097-11/+258
| | | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add 'Remove all then re-add'." into lmp-mr1-devCraig Stout2014-12-091-1/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add 'Remove all then re-add'.Craig Stout2014-12-081-1/+17
| | | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am b0bedfe4: am 53c3c2e5: Update support extra version to 21.0.3 DO NOT MERGE.Xavier Ducrohet2014-12-051-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 53c3c2e5: Update support extra version to 21.0.3 DO NOT MERGE.Xavier Ducrohet2014-12-051-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update support extra version to 21.0.3 DO NOT MERGE.Xavier Ducrohet2014-12-051-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates for compatLib changes to MedaiRouter support libRoboErik2014-12-041-6/+0
| | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 7dd11bd0: am ca15c415: Merge "Add tzdata to SDK build" into lmp-devDeepanshu Gupta2014-12-041-0/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |