summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am b5e47228: Add StrongAuthTrackerAdrian Roos2015-08-2212-139/+462
|\
| * Add StrongAuthTrackerAdrian Roos2015-08-2112-139/+462
* | am ab45a217: Make wake-and-unlock fasterJorim Jaggi2015-08-225-21/+39
|\ \ | |/
| * Make wake-and-unlock fasterJorim Jaggi2015-08-215-21/+39
* | am 86bed406: Fix fingerprint listening state race conditionsJorim Jaggi2015-08-221-35/+68
|\ \ | |/
| * Fix fingerprint listening state race conditionsJorim Jaggi2015-08-211-35/+68
* | am 446c00a2: am cb59747d: Merge "Add missing removed permissions to the platf...Svetoslav Ganov2015-08-211-0/+40
|\ \ | |/
| * am cb59747d: Merge "Add missing removed permissions to the platform manifest"...Svetoslav Ganov2015-08-211-0/+40
| |\
| | * Merge "Add missing removed permissions to the platform manifest" into mnc-devSvetoslav Ganov2015-08-211-0/+40
| | |\
| | | * Add missing removed permissions to the platform manifestSvet Ganov2015-08-201-0/+40
* | | | am 79cb3ef9: am 7cd2d343: am 852c6178: (-s ours) am b63e291d: am 88556ac2: am...Sebastien Hertz2015-08-210-0/+0
|\ \ \ \ | |/ / /
| * | | am 7cd2d343: am 852c6178: (-s ours) am b63e291d: am 88556ac2: am 599dc2bd: am...Sebastien Hertz2015-08-210-0/+0
| |\ \ \ | | |/ /
| | * | am 852c6178: (-s ours) am b63e291d: am 88556ac2: am 599dc2bd: am 50af68e7: am...Sebastien Hertz2015-08-210-0/+0
| | |\ \
| | | * \ am b63e291d: am 88556ac2: am 599dc2bd: am 50af68e7: am 55f86b18: (-s ours) am...Sebastien Hertz2015-08-210-0/+0
| | | |\ \
| | | | * \ am 88556ac2: am 599dc2bd: am 50af68e7: am 55f86b18: (-s ours) am 9e7a0ddb: am...Sebastien Hertz2015-08-210-0/+0
| | | | |\ \
| | | | | * \ am 599dc2bd: am 50af68e7: am 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Al...Sebastien Hertz2015-08-210-0/+0
| | | | | |\ \
| | | | | | * \ am 50af68e7: am 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow debugging...Sebastien Hertz2015-08-210-0/+0
| | | | | | |\ \
| | | | | | | * \ am 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow debugging only for app...Sebastien Hertz2015-08-210-0/+0
| | | | | | | |\ \
| | | | | | | | * \ am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO...Sebastien Hertz2015-08-213-12/+16
| | | | | | | | |\ \
| | | | | | | | | * \ am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGESebastien Hertz2015-08-213-12/+16
| | | | | | | | | |\ \
| | | | | | | | | | * | Allow debugging only for apps forked from zygote DO NOT MERGESebastien Hertz2015-08-193-12/+16
* | | | | | | | | | | | am 5d2faf11: am c5151d2c: am b60bc0ec: resolved conflicts for merge of a2d193...Sebastien Hertz2015-08-210-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am c5151d2c: am b60bc0ec: resolved conflicts for merge of a2d19318 to lmp-mr1...Sebastien Hertz2015-08-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | am b60bc0ec: resolved conflicts for merge of a2d19318 to lmp-mr1-ub-devSebastien Hertz2015-08-210-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | resolved conflicts for merge of a2d19318 to lmp-mr1-ub-devSebastien Hertz2015-08-213-10/+14
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / /
| | | | * | | | | | | | am 87a786af: am 445ab7fa: am ff8dc212: Allow debugging only for apps forked f...Sebastien Hertz2015-08-213-10/+14
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / /
| | | | | * | | | | | | am 445ab7fa: am ff8dc212: Allow debugging only for apps forked from zygoteSebastien Hertz2015-08-213-10/+14
| | | | | |\ \ \ \ \ \ \ | | | | | | |/ / / / / /
| | | | | | * | | | | | am ff8dc212: Allow debugging only for apps forked from zygoteSebastien Hertz2015-08-213-10/+14
| | | | | | |\ \ \ \ \ \ | | | | | | | |/ / / / /
| | | | | | | * | | | | Allow debugging only for apps forked from zygoteSebastien Hertz2015-08-193-10/+14
* | | | | | | | | | | | am 99b252ad: am ddc2536d: Make sure to kill restore-at-install full-data targ...Christopher Tate2015-08-201-16/+30
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am ddc2536d: Make sure to kill restore-at-install full-data targets after res...Christopher Tate2015-08-201-16/+30
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Make sure to kill restore-at-install full-data targets after restoreChristopher Tate2015-08-201-16/+30
* | | | | | | | | | | | am 786529f2: am 54c807e7: Merge "Translate ripple mask to account for drawabl...Alan Viverette2015-08-201-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am 54c807e7: Merge "Translate ripple mask to account for drawable bounds" int...Alan Viverette2015-08-201-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Merge "Translate ripple mask to account for drawable bounds" into mnc-devAlan Viverette2015-08-201-1/+2
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Translate ripple mask to account for drawable boundsAlan Viverette2015-08-201-1/+2
* | | | | | | | | | | | | am ea57b592: am 1773ded8: Merge "Fixed key comparison in equals method" into ...Fyodor Kupolov2015-08-201-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | am 1773ded8: Merge "Fixed key comparison in equals method" into mnc-devFyodor Kupolov2015-08-201-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Merge "Fixed key comparison in equals method" into mnc-devFyodor Kupolov2015-08-201-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Fixed key comparison in equals methodFyodor Kupolov2015-08-201-1/+1
* | | | | | | | | | | | | | am 33074733: am 46eddef4: am 504623e1: am 5389f46c: Docs: Fixes to interactiv...David Friedman2015-08-202-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | am 46eddef4: am 504623e1: am 5389f46c: Docs: Fixes to interactive-watch-face ...David Friedman2015-08-202-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | am 504623e1: am 5389f46c: Docs: Fixes to interactive-watch-face docs (CL 743190)David Friedman2015-08-202-3/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | / / / / / / / / / | | | | |/ / / / / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | am 5389f46c: Docs: Fixes to interactive-watch-face docs (CL 743190)David Friedman2015-08-202-3/+3
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Docs: Fixes to interactive-watch-face docs (CL 743190)David Friedman2015-08-202-3/+3
* | | | | | | | | | | | | | am a001f7ae: Merge "Add carrier config variable to hide merge call button" in...Tyler Gunn2015-08-201-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge "Add carrier config variable to hide merge call button" into mnc-dr-devTyler Gunn2015-08-201-0/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Add carrier config variable to hide merge call buttonSungmin Choi2015-08-181-0/+8
* | | | | | | | | | | | | | | am b460cc88: Merge "Remove wifi enabled checking from settings TetherUtil" in...Mitchell Wills2015-08-201-23/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge "Remove wifi enabled checking from settings TetherUtil" into mnc-dr-devMitchell Wills2015-08-201-23/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \