summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 22878790: am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-devRicardo Cervera2015-01-163-1/+11
|\
| * am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-devRicardo Cervera2015-01-163-1/+11
| |\
| | * resolved conflicts for merge of e8f6bd48 to lmp-devRicardo Cervera2015-01-163-1/+11
| | |\
| | | * am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(...Ricardo Cervera2015-01-163-1/+11
| | | |\
| | | | * am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256Ricardo Cervera2015-01-163-1/+11
| | | | |\
| | | | | * docs: Added info on noHistory and onActivityResult(). Bug: 13807256Ricardo Cervera2014-11-053-1/+11
* | | | | | am b43a7eef: am 3212c3aa: Merge "docs: studio support library revisions updat...Rich Slogar2015-01-161-0/+106
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 3212c3aa: Merge "docs: studio support library revisions update" into lmp-docsRich Slogar2015-01-161-0/+106
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "docs: studio support library revisions update" into lmp-docsRich Slogar2015-01-161-0/+106
| | |\ \ \ \
| | | * | | | docs: studio support library revisions updateRich Slogar2015-01-151-0/+106
* | | | | | | am 7b7f074f: am d1ff8605: Merge "Doc change: Add new analytics information to...Dirk Dougherty2015-01-1630-1/+1348
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am d1ff8605: Merge "Doc change: Add new analytics information to Distribute."...Dirk Dougherty2015-01-1630-1/+1348
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Doc change: Add new analytics information to Distribute." into lmp-docsDirk Dougherty2015-01-1630-1/+1348
| | |\ \ \ \ \
| | | * | | | | Doc change: Add new analytics information to Distribute.Dirk Dougherty2015-01-1530-1/+1348
* | | | | | | | am 3505303a: am 3b7dbd66: Merge "docs: build link update" into lmp-docsRich Slogar2015-01-161-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 3b7dbd66: Merge "docs: build link update" into lmp-docsRich Slogar2015-01-161-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "docs: build link update" into lmp-docsRich Slogar2015-01-161-1/+1
| | |\ \ \ \ \ \
| | | * | | | | | docs: build link updateRich Slogar2015-01-071-1/+1
* | | | | | | | | am f1feda36: am 485b9566: Merge "docs: Plugin reference update" into lmp-docsRich Slogar2015-01-161-4/+8
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 485b9566: Merge "docs: Plugin reference update" into lmp-docsRich Slogar2015-01-161-4/+8
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge "docs: Plugin reference update" into lmp-docsRich Slogar2015-01-161-4/+8
| | |\ \ \ \ \ \ \
| | | * | | | | | | docs: Plugin reference updateRich Slogar2014-12-301-4/+8
* | | | | | | | | | am f38122da: am 48fc1d7b: Merge "docs: studio sample procedure update" into l...Rich Slogar2015-01-162-18/+53
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 48fc1d7b: Merge "docs: studio sample procedure update" into lmp-docsRich Slogar2015-01-162-18/+53
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge "docs: studio sample procedure update" into lmp-docsRich Slogar2015-01-162-18/+53
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | |
| | | * | | | | | | docs: studio sample procedure updateRich Slogar2014-12-192-18/+53
* | | | | | | | | | Merge "Sync file before using JournaledFile commit." into lmp-mr1-devKenny Guy2015-01-161-0/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Sync file before using JournaledFile commit.Kenny Guy2015-01-151-0/+3
* | | | | | | | | | | CEC: Do not send <Active Source> when TV wakes up by one touch playJinsuk Kim2015-01-162-1/+11
* | | | | | | | | | | CEC: Buffer Cec messages while allocating logical addressJinsuk Kim2015-01-162-10/+93
* | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into lmp-mr1-devGeoff Mendal2015-01-155-479/+479
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-01-155-479/+479
* | | | | | | | | | | | Merge "Debug for bug 18201239." into lmp-mr1-devCraig Mautner2015-01-152-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Debug for bug 18201239.Craig Mautner2015-01-152-2/+4
* | | | | | | | | | | | | Merge "Update generationId on bitmaps when decoded into by BitmapRegionDecode...Chris Craik2015-01-151-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Update generationId on bitmaps when decoded into by BitmapRegionDecoderChris Craik2015-01-141-0/+1
* | | | | | | | | | | | | | Merge "Ensure scroll assets are drawn with correct opacity" into lmp-mr1-devAlan Viverette2015-01-152-1/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Ensure scroll assets are drawn with correct opacityAlan Viverette2015-01-152-1/+11
* | | | | | | | | | | | | | | Merge "AudioManager: make AudioPortEventHandler static" into lmp-mr1-devEric Laurent2015-01-152-89/+91
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | AudioManager: make AudioPortEventHandler staticEric Laurent2015-01-152-89/+91
| | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge "Camera: Clarify JNI exception message" into lmp-mr1-devEino-Ville Talvala2015-01-151-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Camera: Clarify JNI exception messageEino-Ville Talvala2015-01-121-1/+2
* | | | | | | | | | | | | | | | am d5a114cd: am d3cc11a1: docs: Remove reference to handheld app for bitmap r...Luan Nguyen2015-01-151-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / |/| | | | | | / / / / / / / / / | | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | am d3cc11a1: docs: Remove reference to handheld app for bitmap resource locat...Luan Nguyen2015-01-151-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | docs: Remove reference to handheld app for bitmap resource locations.Luan Nguyen2015-01-151-2/+2
| | | |_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | |
* | | | | | | | | | | | | | Merge "Fudge getRightPaddingOffset in TextView to match clipRect." into lmp-m...Roozbeh Pournader2015-01-151-6/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fudge getRightPaddingOffset in TextView to match clipRect.Roozbeh Pournader2015-01-141-6/+8
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge "Fix javadoc for UserManager.KEY_RESTRICTIONS_PENDING" into lmp-mr1-devNicolas Prevot2015-01-151-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix javadoc for UserManager.KEY_RESTRICTIONS_PENDINGNicolas Prevot2015-01-131-2/+4
* | | | | | | | | | | | | | | Merge "CEC: Support sendStandby() for MHL device" into lmp-mr1-devJinsuk Kim2015-01-153-0/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2025-02-14 20:31:26 +0000