summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Fixing conference merge where only one party is added to conference." ...Tyler Gunn2015-02-022-0/+11
|\
| * Fixing conference merge where only one party is added to conference.Tyler Gunn2015-01-292-0/+11
* | am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build br...Jon Larimer2015-01-310-0/+0
|\ \
| * \ am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build br...Jon Larimer2015-01-310-0/+0
| |\ \
| | * \ am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build br...Jon Larimer2015-01-310-0/+0
| | |\ \
| | | * \ am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build br...Jon Larimer2015-01-311-5/+5
| | | |\ \
* | | | \ \ am 1a9bf5c1: Merge "docs: training intent doc error update" into lmp-docs aut...Joe Fernandez2015-01-311-1/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 1a9bf5c1: Merge "docs: training intent doc error update" into lmp-docsJoe Fernandez2015-01-311-1/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 1a9bf5c1: Merge "docs: training intent doc error update" into lmp-docsJoe Fernandez2015-01-311-1/+2
| | |\ \ \ \
| | | * \ \ \ Merge "docs: training intent doc error update" into lmp-docsJoe Fernandez2015-01-311-1/+2
| | | |\ \ \ \
| | | | * | | | docs: training intent doc error updateRich Slogar2015-01-301-1/+2
* | | | | | | | am 3d5535cf: Merge "Limited AppCompat support" into lmp-devDeepanshu Gupta2015-01-315-124/+452
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 3d5535cf: Merge "Limited AppCompat support" into lmp-devDeepanshu Gupta2015-01-315-124/+452
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "Limited AppCompat support" into lmp-devDeepanshu Gupta2015-01-315-124/+452
| | |\ \ \ \ \ \
| | | * | | | | | Limited AppCompat supportDeepanshu Gupta2015-01-285-124/+452
* | | | | | | | | am 1d59871e: Merge "Resource resolution fixes." into lmp-devDeepanshu Gupta2015-01-312-8/+24
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 1d59871e: Merge "Resource resolution fixes." into lmp-devDeepanshu Gupta2015-01-312-8/+24
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge "Resource resolution fixes." into lmp-devDeepanshu Gupta2015-01-312-8/+24
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Resource resolution fixes.Deepanshu Gupta2015-01-152-8/+24
* | | | | | | | | am 5c37c8e6: am d801a123: am 2b68ab3a: Merge "docs: studio emulator platform ...Joe Fernandez2015-01-311-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am d801a123: am 2b68ab3a: Merge "docs: studio emulator platform update" into ...Joe Fernandez2015-01-301-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | am 2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docsJoe Fernandez2015-01-301-1/+1
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | Merge "docs: studio emulator platform update" into lmp-docsJoe Fernandez2015-01-301-1/+1
| | | |\ \ \ \ \ \
| | | | * | | | | | docs: studio emulator platform updateRich Slogar2015-01-211-1/+1
* | | | | | | | | | am feb362a5: am a0d3bfbe: am 5c9d0de1: am 545dd853: am 9a425aa7: am 159aa735:...Jon Larimer2015-01-301-5/+5
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am a0d3bfbe: am 5c9d0de1: am 545dd853: am 9a425aa7: am 159aa735: am d4031809:...Jon Larimer2015-01-301-5/+5
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | am 5c9d0de1: am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43:...Jon Larimer2015-01-301-5/+5
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / | | | |/| | | | | |
| | | * | | | | | | am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build br...Jon Larimer2015-01-301-5/+5
| | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in old...Jon Larimer2015-01-301-5/+5
| | | | |\ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches b...Jon Larimer2015-01-301-5/+5
| | | | | |\ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <>...Jon Larimer2015-01-301-5/+5
| | | | | | |\ \ \ \ \ \ \
| | | | | | | * \ \ \ \ \ \ am 48c95c43: Fix build breakage in older branches by avoiding <> notationJon Larimer2015-01-301-5/+5
| | | | | | | |\ \ \ \ \ \ \
| | | | | | | | * | | | | | | Fix build breakage in older branches by avoiding <> notationJon Larimer2015-01-291-5/+5
* | | | | | | | | | | | | | | Merge "[DS] Correct the access method for telephony system property" into lmp...Stuart Scott2015-01-303-27/+462
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | [DS] Correct the access method for telephony system propertyLegler Wu2015-01-293-27/+462
* | | | | | | | | | | | | | | | Merge "Revert "CEC: Let playback device switch TV input after bootup"" into l...Jinsuk Kim2015-01-301-4/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Revert "CEC: Let playback device switch TV input after bootup"Jinsuk Kim2015-01-301-4/+0
* | | | | | | | | | | | | | | | | Merge "Fix QS bluetooth tile accessibility issue" into lmp-mr1-devJason Monk2015-01-302-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Fix QS bluetooth tile accessibility issueJason Monk2015-01-302-2/+5
* | | | | | | | | | | | | | | | | | Fix expandSettingsPanel status bar callJason Monk2015-01-302-14/+21
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge "Avoid bug in LinearLayout measurement" into lmp-mr1-devAlan Viverette2015-01-303-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Avoid bug in LinearLayout measurementAlan Viverette2015-01-303-0/+7
* | | | | | | | | | | | | | | | | | Merge "Fix wrap property creation when truncating." into lmp-mr1-devChristopher Ferris2015-01-301-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Fix wrap property creation when truncating.Christopher Ferris2015-01-291-1/+6
* | | | | | | | | | | | | | | | | | | am f4fa2acb: am 6ccb72e6: am e0063faa: Merge "docs: linux requirements update...Rich Slogar2015-01-301-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | am 6ccb72e6: am e0063faa: Merge "docs: linux requirements update" into lmp-docsRich Slogar2015-01-301-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | am e0063faa: Merge "docs: linux requirements update" into lmp-docsRich Slogar2015-01-301-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ / / / / / | | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Merge "docs: linux requirements update" into lmp-docsRich Slogar2015-01-301-2/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | docs: linux requirements updateRich Slogar2015-01-211-2/+2
| | | | | |_|_|_|_|_|_|_|_|_|/ / / / / | | | | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | am 8f5714d3: am a3031211: am b86c3b80: Merge "docs: Card View for Android TV ...Scott Rowe2015-01-305-1/+164
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /