summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 70c27436: am daa1c969: am aaf23a9a: am c3f5d694: Merge "Hang off call by p...Jeff Brown2014-03-111-1/+1
|\
| * am daa1c969: am aaf23a9a: am c3f5d694: Merge "Hang off call by power button w...Jeff Brown2014-03-111-1/+1
| |\
| | * am aaf23a9a: am c3f5d694: Merge "Hang off call by power button while screen i...Jeff Brown2014-03-111-1/+1
| | |\
| | | * am c3f5d694: Merge "Hang off call by power button while screen is on"Jeff Brown2014-03-101-1/+1
| | | |\
| | | | * Merge "Hang off call by power button while screen is on"Jeff Brown2014-03-111-1/+1
| | | | |\
| | | | | * Hang off call by power button while screen is onshower2014-01-031-1/+1
* | | | | | am 3c6bb4d4: am f2e837e5: am e7f7af96: am 35c8ebab: Merge "take account of Ro...Jeff Brown2014-03-111-2/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am f2e837e5: am e7f7af96: am 35c8ebab: Merge "take account of RotationVector\...Jeff Brown2014-03-111-2/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | am e7f7af96: am 35c8ebab: Merge "take account of RotationVector\'s new extra ...Jeff Brown2014-03-111-2/+2
| | |\ \ \ \ | | | |/ / /
| | | * | | am 35c8ebab: Merge "take account of RotationVector\'s new extra parameter"Jeff Brown2014-03-101-2/+2
| | | |\ \ \ | | | | |/ /
| | | | * | Merge "take account of RotationVector's new extra parameter"Jeff Brown2014-03-111-2/+2
| | | | |\ \
| | | | | * | take account of RotationVector's new extra parameterBalint Ureczky2013-12-061-2/+2
* | | | | | | MediaPlayer: fix int overflow issue in MediaTimeProviderLajos Molnar2014-03-101-1/+1
* | | | | | | Merge "Support unique calibration per orientation"Michael Wright2014-03-105-50/+130
|\ \ \ \ \ \ \
| * | | | | | | Support unique calibration per orientationJason Gerecke2014-03-105-50/+130
* | | | | | | | Merge changes I81c76e8c,I4daac2b1Michael Wright2014-03-109-1/+381
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Initialize mAffineTransform and update on modificationJason Gerecke2014-03-102-2/+75
| * | | | | | | Allow persistence of input device calibrationJason Gerecke2014-03-108-1/+308
* | | | | | | | am 8566f156: am c8b43bc0: am fd6b9975: Prevent overflow from MeasureSpec.adju...Adam Powell2014-03-101-2/+29
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | am c8b43bc0: am fd6b9975: Prevent overflow from MeasureSpec.adjust; measure c...Adam Powell2014-03-101-2/+29
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | am fd6b9975: Prevent overflow from MeasureSpec.adjust; measure cache fixAdam Powell2014-03-101-2/+29
| | |\ \ \ \ \ \
| | | * | | | | | Prevent overflow from MeasureSpec.adjust; measure cache fixAdam Powell2014-03-101-2/+29
* | | | | | | | | Merge "Change comment for platform version in master"Jose Lima2014-03-101-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Change comment for platform version in masterJose Lima2014-03-101-1/+1
* | | | | | | | | Merge "Allow related users to show activities on primary user"Amith Yamasani2014-03-107-16/+104
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Allow related users to show activities on primary userAmith Yamasani2014-03-077-16/+104
* | | | | | | | | | Merge "Fix bug that allowed avoiding lockout if too many wrong patterns are e...Adrian Roos2014-03-101-11/+12
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix bug that allowed avoiding lockout if too many wrong patterns are entered.Adrian Roos2014-03-101-11/+12
* | | | | | | | | | | am 7d50596a: am 6835033a: am c6f0b54d: Merge "Add CAP_BLOCK_SUSPEND to system...Benoit Goby2014-03-100-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | am 6835033a: am c6f0b54d: Merge "Add CAP_BLOCK_SUSPEND to system server" into...Benoit Goby2014-03-101-0/+1
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | |
| | * | | | | | | | | am c6f0b54d: Merge "Add CAP_BLOCK_SUSPEND to system server" into klp-modular-devBenoit Goby2014-03-101-0/+1
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / | | | |/| | | | | | |
| | | * | | | | | | | Merge "Add CAP_BLOCK_SUSPEND to system server" into klp-modular-devBenoit Goby2014-03-101-0/+1
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Add CAP_BLOCK_SUSPEND to system serverBenoit Goby2014-03-081-0/+1
* | | | | | | | | | | | Merge "MediaMuxer: added WebM filetype; open output file RW."Robert Shih2014-03-102-10/+12
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | MediaMuxer: added WebM filetype; open output file RW.Robert Shih2014-01-292-10/+12
* | | | | | | | | | | | | am 7b7d111b: am 9e736723: am ec4c7752: am ab97d617: Merge "Only pass -Xprofil...Brian Carlstrom2014-03-101-3/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | / / / / / | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | am 9e736723: am ec4c7752: am ab97d617: Merge "Only pass -Xprofile-* options t...Brian Carlstrom2014-03-101-3/+4
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | am ec4c7752: am ab97d617: Merge "Only pass -Xprofile-* options to ART"Brian Carlstrom2014-03-101-3/+4
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / | | | |/| | | | | | | |
| | | * | | | | | | | | am ab97d617: Merge "Only pass -Xprofile-* options to ART"Brian Carlstrom2014-03-101-3/+4
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / / | | | | |/| | | | | | |
| | | | * | | | | | | | Merge "Only pass -Xprofile-* options to ART"Brian Carlstrom2014-03-101-3/+4
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | Only pass -Xprofile-* options to ARTBrian Carlstrom2014-03-101-3/+4
| | | | |/ / / / / / / /
* | | | | | | | | | | | Merge "DisplayList lifecycle changes"John Reck2014-03-1013-34/+48
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | DisplayList lifecycle changesJohn Reck2014-03-1013-34/+48
* | | | | | | | | | | | | Merge "Clean up a few minor issues"Paul Lawrence2014-03-104-12/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Clean up a few minor issuesPaul Lawrence2014-02-144-12/+22
* | | | | | | | | | | | | | Merge "Fixed a bug where the current wallpaper could be reset on an update"Selim Cinek2014-03-101-6/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fixed a bug where the current wallpaper could be reset on an updateSelim Cinek2014-03-061-6/+14
* | | | | | | | | | | | | | | Fix compiler warning in Activity.java.John Spurlock2014-03-101-1/+3
| |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge "Fix build"Jessica Hummel2014-03-101-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix buildJessica Hummel2014-03-101-1/+1