summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add two new samples." into lmp-docsTrevor Johns2014-11-122-4/+6
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | Add two new samples.Renato Mangini2014-11-122-4/+6
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 5d84789a: am 062a2d1c: am fcd28181: sdk.atree: Disable Wear samples for lm...Trevor Johns2014-11-121-18/+19
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | am 062a2d1c: am fcd28181: sdk.atree: Disable Wear samples for lmp branchesTrevor Johns2014-11-121-18/+19
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | am fcd28181: sdk.atree: Disable Wear samples for lmp branchesTrevor Johns2014-11-121-18/+19
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|/ / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | sdk.atree: Disable Wear samples for lmp branchesTrevor Johns2014-11-061-18/+19
| | | | |/ / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add split-select tool to SDK build." into lmp-mr1-devAdam Lesinski2014-11-115-1/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | Add split-select tool to SDK build.Adam Lesinski2014-11-055-1/+8
| | | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | am 077d2052: am e3189c68: Update LayoutLib version for API 21 to 2.Deepanshu Gupta2014-11-101-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | / / / / / / / / / / / / / / / / / / / / / | | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | am e3189c68: Update LayoutLib version for API 21 to 2.Deepanshu Gupta2014-11-101-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | Update LayoutLib version for API 21 to 2.Deepanshu Gupta2014-11-101-2/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge "Update TrustAgentService API after review" into lmp-mr1-devJim Miller2014-11-063-10/+78
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | Update TrustAgentService API after reviewJim Miller2014-11-033-10/+78
| | | |_|_|/ / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | |
| * / | | | | | | | | | | | | | | | | | | | | | | Development: Connectivity: Fix receiver leakageDmitry Shmidt2014-11-031-0/+5
| |/ / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | am 883b17b3: am 5b7f5d2b: Update build-tools revision. DO NOT MERGE.Xavier Ducrohet2014-11-011-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | am 5b7f5d2b: Update build-tools revision. DO NOT MERGE.Xavier Ducrohet2014-10-311-1/+1
| | |\| | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | Update build-tools revision. DO NOT MERGE.Xavier Ducrohet2014-10-311-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | am 754cfeb6: am 8641d4da: Move mulit-dex files around.Xavier Ducrohet2014-11-014-5/+5
| |\| | | | | | | | | | | | | | | | | | | | | | | | |_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | am 8641d4da: Move mulit-dex files around.Xavier Ducrohet2014-10-314-5/+5
| | |\| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Move mulit-dex files around.Xavier Ducrohet2014-10-314-5/+5
| * | | | | | | | | | | | | | | | | | | | | | Add secondary text to cards.Tim Kilbourn2014-10-293-4/+18
| * | | | | | | | | | | | | | | | | | | | | | SupportLeanbackDemo: Add test case for updating overview rowDake Gu2014-10-291-10/+23
| * | | | | | | | | | | | | | | | | | | | | | am 25907e2a: am 8361bb0d: Update build-tools and support for multidex.Xavier Ducrohet2014-10-295-1/+7
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | am 8361bb0d: Update build-tools and support for multidex.Xavier Ducrohet2014-10-295-1/+7
| | |\| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Update build-tools and support for multidex.Xavier Ducrohet2014-10-295-1/+7
| * | | | | | | | | | | | | | | | | | | | | | am 9ccbed21: am 86d28ad8: Add jack/jill/multidex lib to build-tools.Xavier Ducrohet2014-10-291-0/+5
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | am 86d28ad8: Add jack/jill/multidex lib to build-tools.Xavier Ducrohet2014-10-281-0/+5
| | |\| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Add jack/jill/multidex lib to build-tools.Xavier Ducrohet2014-10-281-0/+5
| * | | | | | | | | | | | | | | | | | | | | | am ccaaeb5f: am c01f2d39: Merge "Update system images to revision 3" into lmp...bohu2014-10-296-6/+6
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | am c01f2d39: Merge "Update system images to revision 3" into lmp-devbohu2014-10-286-6/+6
| | |\| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge "Update system images to revision 3" into lmp-devbohu2014-10-286-6/+6
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | Update system images to revision 3bohu2014-10-276-6/+6
| | | | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | am 17d47a10: am 5193f245: Merge "Update build tools version to 21.1.0. DO NOT...Xavier Ducrohet2014-10-291-1/+1
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | am 5193f245: Merge "Update build tools version to 21.1.0. DO NOT MERGE." into...Xavier Ducrohet2014-10-281-1/+1
| | |\| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge "Update build tools version to 21.1.0. DO NOT MERGE." into lmp-devXavier Ducrohet2014-10-281-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | Update build tools version to 21.1.0. DO NOT MERGE.Xavier Ducrohet2014-10-271-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | am 5350100b: am f6855153: Merge "resolved conflicts for merge of 3bb3da96 to ...Takeshi Hagikura2014-10-290-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | am f6855153: Merge "resolved conflicts for merge of 3bb3da96 to lmp-dev" into...Takeshi Hagikura2014-10-280-0/+0
| | |\| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge "resolved conflicts for merge of 3bb3da96 to lmp-dev" into lmp-devTakeshi Hagikura2014-10-280-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | resolved conflicts for merge of 3bb3da96 to lmp-devTakeshi Hagikura2014-10-240-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "SupportLeanbackDemo: Add test case of ArrayObjectAdapter.replace()" in...Dake Gu2014-10-281-1/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | SupportLeanbackDemo: Add test case of ArrayObjectAdapter.replace()Dake Gu2014-10-281-1/+15
| | | |_|_|_|_|/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Merge "Enable building gtest for Windows" into lmp-mr1-devAdam Lesinski2014-10-281-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | Enable building gtest for WindowsAdam Lesinski2014-10-241-0/+1
| * | | | | | | | | | | | | | | | | | | | | | | Merge "SupportLeanbackDemo: show case of different image scale type" into lmp...Dake Gu2014-10-271-2/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | SupportLeanbackDemo: show case of different image scale typeDake Gu2014-09-301-2/+14
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | am a916086f: am 5aad4e45: am bd48d1e6: (-s ours) am 05ef7f04: DO NOT MERGE: P...Trevor Johns2014-10-240-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | am 5aad4e45: am bd48d1e6: (-s ours) am 05ef7f04: DO NOT MERGE: Package sample...Trevor Johns2014-10-240-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | am bd48d1e6: (-s ours) am 05ef7f04: DO NOT MERGE: Package samples for Clockwo...Trevor Johns2014-10-240-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 05ef7f04: DO NOT MERGE: Package samples for Clockwork Beryl (API 20, Sampl...Trevor Johns2014-10-240-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | |