summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 2fddfea3: am a3404263: am 2f71ee24: am ffaee8bd: Merge "Fix NPE" into lmp-...Marco Nelissen2015-02-181-12/+11
|\
| * am a3404263: am 2f71ee24: am ffaee8bd: Merge "Fix NPE" into lmp-mr1-devMarco Nelissen2015-02-181-12/+11
| |\
| | * am 2f71ee24: am ffaee8bd: Merge "Fix NPE" into lmp-mr1-devMarco Nelissen2015-02-181-12/+11
| | |\
| | | * am ffaee8bd: Merge "Fix NPE" into lmp-mr1-devMarco Nelissen2015-02-181-12/+11
| | | |\
| | | | * Merge "Fix NPE" into lmp-mr1-devMarco Nelissen2015-02-171-12/+11
| | | | |\
| | | | | * Fix NPEMarco Nelissen2015-02-171-12/+11
* | | | | | am 2007a630: (-s ours) am 28de8edb: am ab8f60e4: am a94e4297: Merge "Do not m...Craig Mautner2015-02-180-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 28de8edb: am ab8f60e4: am a94e4297: Merge "Do not make ActivityContainer a...Craig Mautner2015-02-174-32/+17
| |\ \ \ \ \ | | |/ / / /
| | * | | | am ab8f60e4: am a94e4297: Merge "Do not make ActivityContainer available to a...Craig Mautner2015-02-174-32/+17
| | |\ \ \ \ | | | |/ / /
| | | * | | am a94e4297: Merge "Do not make ActivityContainer available to apps. DO NOT M...Craig Mautner2015-02-174-32/+17
| | | |\ \ \ | | | | |/ /
| | | | * | Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lm...Craig Mautner2015-02-174-32/+17
| | | | |\ \
| | | | | * | Do not make ActivityContainer available to apps. DO NOT MERGECraig Mautner2015-02-174-32/+17
* | | | | | | am b20d48fd: am 014442c2: am 0dfae079: am d5471a0b: Merge "Revert "Fixed acce...Alan Viverette2015-02-182-69/+21
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 014442c2: am 0dfae079: am d5471a0b: Merge "Revert "Fixed accessibility for...Alan Viverette2015-02-172-69/+21
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 0dfae079: am d5471a0b: Merge "Revert "Fixed accessibility for the pin inpu...Alan Viverette2015-02-172-69/+21
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | am d5471a0b: Merge "Revert "Fixed accessibility for the pin input view on key...Alan Viverette2015-02-172-69/+21
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | Merge "Revert "Fixed accessibility for the pin input view on keyguard."" into...Alan Viverette2015-02-172-69/+21
| | | | |\ \ \
| | | | | * | | Revert "Fixed accessibility for the pin input view on keyguard."Adrian Roos2015-02-172-69/+21
* | | | | | | | am 7286d1ff: am 157c75e4: am 504c77e1: am d611fc4e: Merge "Fix year picker in...Alan Viverette2015-02-181-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 157c75e4: am 504c77e1: am d611fc4e: Merge "Fix year picker initial range" ...Alan Viverette2015-02-171-0/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am 504c77e1: am d611fc4e: Merge "Fix year picker initial range" into lmp-mr1-devAlan Viverette2015-02-171-0/+1
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | am d611fc4e: Merge "Fix year picker initial range" into lmp-mr1-devAlan Viverette2015-02-171-0/+1
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | Merge "Fix year picker initial range" into lmp-mr1-devAlan Viverette2015-02-171-0/+1
| | | | |\ \ \ \
| | | | | * | | | Fix year picker initial rangeAlan Viverette2015-02-171-0/+1
| | | | | | |/ / | | | | | |/| |
* | | | | | | | am 65d12bf7: am c7067053: am 2b29d96f: am 82510fa5: am 9c9a3afb: am 8823b93d:...Rich Slogar2015-02-183-0/+115
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am c7067053: am 2b29d96f: am 82510fa5: am 9c9a3afb: am 8823b93d: Merge change...Rich Slogar2015-02-173-0/+115
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am 2b29d96f: am 82510fa5: am 9c9a3afb: am 8823b93d: Merge changes If3a78fc7,I...Rich Slogar2015-02-173-0/+115
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | am 82510fa5: am 9c9a3afb: am 8823b93d: Merge changes If3a78fc7,Ifbe3f03a into...Rich Slogar2015-02-173-0/+115
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | am 9c9a3afb: am 8823b93d: Merge changes If3a78fc7,Ifbe3f03a into lmp-docsRich Slogar2015-02-173-0/+115
| | | | |\ \ \ \
| | | | | * \ \ \ am 9c9a3afb: am 8823b93d: Merge changes If3a78fc7,Ifbe3f03a into lmp-docsRich Slogar2015-02-173-0/+115
| | | | | |\ \ \ \
| | | | | | * \ \ \ am 8823b93d: Merge changes If3a78fc7,Ifbe3f03a into lmp-docsRich Slogar2015-02-173-0/+115
| | | | | | |\ \ \ \
| | | | | | | * \ \ \ Merge changes If3a78fc7,Ifbe3f03a into lmp-docsRich Slogar2015-02-173-0/+115
| | | | | | | |\ \ \ \
| | | | | | | | * | | | docs: studio proxy setting setupRich Slogar2015-02-131-0/+115
| | | | | | | | * | | | docs: studio proxy setupRich Slogar2015-01-262-0/+0
* | | | | | | | | | | | am ea970051: am aa5b5b74: am 1289d522: am 2a6bf82e: am 533149d5: am fe3e71be:...Oliver Woodman2015-02-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am aa5b5b74: am 1289d522: am 2a6bf82e: am 533149d5: am fe3e71be: Merge "Updat...Oliver Woodman2015-02-170-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | am 1289d522: am 2a6bf82e: am 533149d5: am fe3e71be: Merge "Update ExoPlayer d...Oliver Woodman2015-02-172-29/+27
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
* | | | | | | | | | | | am d9a8bce7: am fa0ac1fd: am 696ea51a: am dbb32faf: am 8c124744: am 76dd6aa7:...Rich Slogar2015-02-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am fa0ac1fd: am 696ea51a: am dbb32faf: am 8c124744: am 76dd6aa7: Merge "docs:...Rich Slogar2015-02-170-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | am 696ea51a: am dbb32faf: am 8c124744: am 76dd6aa7: Merge "docs: studio revis...Rich Slogar2015-02-171-1/+28
| | |\ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ am 39545001: am cb5f052e: am 4826bed5: am 2d43b730: am d2856643: am 4abf87f1:...Rich Slogar2015-02-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | am cb5f052e: am 4826bed5: am 2d43b730: am d2856643: am 4abf87f1: Merge "docs:...Rich Slogar2015-02-170-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | am 4826bed5: am 2d43b730: am d2856643: am 4abf87f1: Merge "docs: android plug...Rich Slogar2015-02-172-0/+156
| | |\ \ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ \ am 480fb3fa: am 32759833: am 40191d8e: am a6614a12: am 53ec037f: am 03efba0e:...David Friedman2015-02-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | am 32759833: am 40191d8e: am a6614a12: am 53ec037f: am 03efba0e: Merge "This ...David Friedman2015-02-170-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | am 40191d8e: am a6614a12: am 53ec037f: am 03efba0e: Merge "This file is mispl...David Friedman2015-02-171-83/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ \ \ am bd966f8f: am 803499e1: am c2fa5e20: am 0a300b89: am ad879adb: Merge "Add A...Deepanshu Gupta2015-02-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | am 803499e1: am c2fa5e20: am 0a300b89: am ad879adb: Merge "Add Asset manageme...Deepanshu Gupta2015-02-170-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | am c2fa5e20: am 0a300b89: am ad879adb: Merge "Add Asset management support fo...Deepanshu Gupta2015-02-174-20/+126
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Save per-user camera policy in different system properties"Amith Yamasani2015-02-181-5/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \