summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 7ef77271: am bea9d7b9: Merge "Reset fingerprint lockout timer when strong ...Jim Miller2015-08-196-0/+42
|\
| * am bea9d7b9: Merge "Reset fingerprint lockout timer when strong auth is used....Jim Miller2015-08-186-0/+42
| |\
| | * Merge "Reset fingerprint lockout timer when strong auth is used." into mnc-dr...Jim Miller2015-08-186-0/+42
| | |\
| | | * Reset fingerprint lockout timer when strong auth is used.Jim Miller2015-08-186-0/+42
* | | | am 2591d6ff: am 358fcc79: Do not start with a black frame in bootanimationJorim Jaggi2015-08-191-5/+0
|\ \ \ \ | |/ / /
| * | | am 358fcc79: Do not start with a black frame in bootanimationJorim Jaggi2015-08-181-5/+0
| |\ \ \ | | |/ /
| | * | Do not start with a black frame in bootanimationJorim Jaggi2015-08-181-5/+0
* | | | am e11fbc08: am 33a5c807: resolved conflicts for merge of 448216e7 to mnc-dr-devJim Miller2015-08-192-9/+0
|\ \ \ \ | |/ / /
| * | | am 33a5c807: resolved conflicts for merge of 448216e7 to mnc-dr-devJim Miller2015-08-182-9/+0
| |\ \ \ | | |/ /
| | * | resolved conflicts for merge of 448216e7 to mnc-dr-devJim Miller2015-08-182-9/+0
| | |\ \ | | | |/ | | |/|
| | | * Merge "Revert "Disable fingerprint when remotely reset by DPM"" into mnc-devJim Miller2015-08-182-12/+1
| | | |\
| | | | * Revert "Disable fingerprint when remotely reset by DPM"Jim Miller2015-08-172-12/+1
* | | | | am 9b1fd822: am 2ad94499: Merge "Use init to write usb typec props." into mnc...Tim Kilbourn2015-08-191-12/+42
|\ \ \ \ \ | |/ / / /
| * | | | am 2ad94499: Merge "Use init to write usb typec props." into mnc-dr-devTim Kilbourn2015-08-181-12/+42
| |\ \ \ \ | | |/ / /
| | * | | Merge "Use init to write usb typec props." into mnc-dr-devTim Kilbourn2015-08-181-12/+42
| | |\ \ \
| | | * | | Use init to write usb typec props.Tim Kilbourn2015-08-141-12/+42
* | | | | | am 31a536e1: am 57928364: am 53c38c88: Merge "Revert "Create a special CONSTR...Roozbeh Pournader2015-08-191-20/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 57928364: am 53c38c88: Merge "Revert "Create a special CONSTRAINED font bu...Roozbeh Pournader2015-08-181-20/+4
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 53c38c88: Merge "Revert "Create a special CONSTRAINED font bucket in frame...Roozbeh Pournader2015-08-181-20/+4
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Merge "Revert "Create a special CONSTRAINED font bucket in frameworks."" into...Roozbeh Pournader2015-08-181-20/+4
| | | |\ \ \
| | | | * | | Revert "Create a special CONSTRAINED font bucket in frameworks."Roozbeh Pournader2015-08-181-20/+4
* | | | | | | am 8100b3fa: am 4439dcdc: am af75c17b: Fix issue #23270878: NPE in UsageStats...Dianne Hackborn2015-08-191-0/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 4439dcdc: am af75c17b: Fix issue #23270878: NPE in UsageStatsService while...Dianne Hackborn2015-08-181-0/+3
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am af75c17b: Fix issue #23270878: NPE in UsageStatsService while running User...Dianne Hackborn2015-08-181-0/+3
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Fix issue #23270878: NPE in UsageStatsService while running UserManagementTestDianne Hackborn2015-08-181-0/+3
| | | |/ / /
* | | | | | am 677cd087: am e9de1b4c: am 9a010d0a: Merge "Allow debugging only for apps f...Sebastien Hertz2015-08-183-10/+14
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am e9de1b4c: am 9a010d0a: Merge "Allow debugging only for apps forked from zy...Sebastien Hertz2015-08-183-10/+14
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 9a010d0a: Merge "Allow debugging only for apps forked from zygote" into mn...Sebastien Hertz2015-08-183-10/+14
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge "Allow debugging only for apps forked from zygote" into mnc-devSebastien Hertz2015-08-183-10/+14
| | | |\ \ \
| | | | * | | Allow debugging only for apps forked from zygoteSebastien Hertz2015-08-103-10/+14
* | | | | | | am 20a9ca15: am d294dc43: am 96695d2f: Merge "docs: App link doc update for M...Joe Fernandez2015-08-181-54/+502
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am d294dc43: am 96695d2f: Merge "docs: App link doc update for M Preview 3" i...Joe Fernandez2015-08-181-54/+502
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 96695d2f: Merge "docs: App link doc update for M Preview 3" into mnc-devJoe Fernandez2015-08-181-54/+502
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge "docs: App link doc update for M Preview 3" into mnc-devJoe Fernandez2015-08-181-54/+502
| | | |\ \ \ \
| | | | * | | | docs: App link doc update for M Preview 3Joe Fernandez2015-08-181-54/+502
* | | | | | | | am d7792759: am 5f89ce64: am 3e40a27e: Merge "Docs: Fixing files that didn\'t...David Friedman2015-08-187-423/+22
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 5f89ce64: am 3e40a27e: Merge "Docs: Fixing files that didn\'t merge proper...David Friedman2015-08-187-423/+22
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am 3e40a27e: Merge "Docs: Fixing files that didn\'t merge properly from mnc-p...David Friedman2015-08-187-423/+22
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge "Docs: Fixing files that didn't merge properly from mnc-preview-docs" i...David Friedman2015-08-187-423/+22
| | | |\ \ \ \ \
| | | | * | | | | Docs: Fixing files that didn't merge properly from mnc-preview-docsDavid Friedman2015-08-177-423/+22
| | | | |/ / / /
* | | | | | | | am b59404a1: am eb2f302d: am 610008c0: Merge "Clear old clip rect when creati...Filip Gruszczynski2015-08-181-1/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am eb2f302d: am 610008c0: Merge "Clear old clip rect when creating new surfac...Filip Gruszczynski2015-08-181-1/+2
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am 610008c0: Merge "Clear old clip rect when creating new surface." into mnc-devFilip Gruszczynski2015-08-181-1/+2
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge "Clear old clip rect when creating new surface." into mnc-devFilip Gruszczynski2015-08-181-1/+2
| | | |\ \ \ \ \
| | | | * | | | | Clear old clip rect when creating new surface.Filip Gruszczynski2015-08-171-1/+2
* | | | | | | | | am 5211c063: am 6da89844: am 12b9c2d6: Merge "Fix issue #23214751: Get a GPS ...Dianne Hackborn2015-08-182-50/+244
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 6da89844: am 12b9c2d6: Merge "Fix issue #23214751: Get a GPS fix before go...Dianne Hackborn2015-08-182-50/+244
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | am 12b9c2d6: Merge "Fix issue #23214751: Get a GPS fix before going in to doz...Dianne Hackborn2015-08-182-50/+244
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Merge "Fix issue #23214751: Get a GPS fix before going in to doze" into mnc-devDianne Hackborn2015-08-182-50/+244
| | | |\ \ \ \ \ \
| | | | * | | | | | Fix issue #23214751: Get a GPS fix before going in to dozeDianne Hackborn2015-08-172-50/+244