summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 7157c2ca: Merge "Revert "Call getInstanceForPackage instead of creating a ...Narayan Kamath2015-07-292-2/+5
|\
| * Merge "Revert "Call getInstanceForPackage instead of creating a new SensorMan...Narayan Kamath2015-07-292-2/+5
| |\
| | * Revert "Call getInstanceForPackage instead of creating a new SensorManager in...Narayan Kamath2015-07-292-2/+5
* | | am 50184147: Merge "Resource for setting default NFC payment component." into...Martijn Coenen2015-07-292-1/+21
|\ \ \ | |/ /
| * | Merge "Resource for setting default NFC payment component." into mnc-devMartijn Coenen2015-07-292-1/+21
| |\ \
| | * | Resource for setting default NFC payment component.Martijn Coenen2015-07-272-1/+21
* | | | am a7b4d6dc: Merge "Keymaster digest/padding NONE no longer means ANY." into ...Shawn Willden2015-07-295-55/+65
|\ \ \ \ | |/ / /
| * | | Merge "Keymaster digest/padding NONE no longer means ANY." into mnc-devShawn Willden2015-07-295-55/+65
| |\ \ \
| | * | | Keymaster digest/padding NONE no longer means ANY.Alex Klyubin2015-07-285-55/+65
* | | | | am b8040265: Merge "Give secondary users read-only physical cards." into mnc-devJeff Sharkey2015-07-295-17/+52
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Give secondary users read-only physical cards." into mnc-devJeff Sharkey2015-07-295-17/+52
| |\ \ \ \
| | * | | | Give secondary users read-only physical cards.Jeff Sharkey2015-07-285-17/+52
* | | | | | am 02022b70: Merge "media: fix estimateFrameRatesFor to use correct ratio" in...Ronghua Wu2015-07-291-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "media: fix estimateFrameRatesFor to use correct ratio" into mnc-devRonghua Wu2015-07-291-1/+1
| |\ \ \ \ \
| | * | | | | media: fix estimateFrameRatesFor to use correct ratioRonghua Wu2015-07-281-1/+1
* | | | | | | am b310c894: Merge "Fix issue #22802691: APR: NPE in ActivityRecord" into mnc...Dianne Hackborn2015-07-291-2/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Fix issue #22802691: APR: NPE in ActivityRecord" into mnc-devDianne Hackborn2015-07-291-2/+2
| |\ \ \ \ \ \
| | * | | | | | Fix issue #22802691: APR: NPE in ActivityRecordDianne Hackborn2015-07-281-2/+2
* | | | | | | | am 5b009d52: Merge "Fix issue #22802617: APR: spurious wtf when restarting a ...Dianne Hackborn2015-07-291-1/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Fix issue #22802617: APR: spurious wtf when restarting a persistent pr...Dianne Hackborn2015-07-291-1/+4
| |\ \ \ \ \ \ \
| | * | | | | | | Fix issue #22802617: APR: spurious wtf when restarting a persistent processDianne Hackborn2015-07-281-1/+4
| | |/ / / / / /
* | | | | | | | am b492ced8: Merge "Fix issue #22802782: APR: NPE in package manager with bad...Dianne Hackborn2015-07-291-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Fix issue #22802782: APR: NPE in package manager with bad intent data"...Dianne Hackborn2015-07-291-2/+2
| |\ \ \ \ \ \ \
| | * | | | | | | Fix issue #22802782: APR: NPE in package manager with bad intent dataDianne Hackborn2015-07-281-2/+2
| | |/ / / / / /
* | | | | | | | am c96e6f19: Merge "BatteryStats: Use proper power calculator when energy dat...Adam Lesinski2015-07-291-12/+17
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "BatteryStats: Use proper power calculator when energy data is received...Adam Lesinski2015-07-291-12/+17
| |\ \ \ \ \ \ \
| | * | | | | | | BatteryStats: Use proper power calculator when energy data is receivedAdam Lesinski2015-07-281-12/+17
* | | | | | | | | am fbcbad13: Merge "Add sizes to SysUI tests" into mnc-devJason Monk2015-07-295-0/+10
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "Add sizes to SysUI tests" into mnc-devJason Monk2015-07-295-0/+10
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Add sizes to SysUI testsJason Monk2015-07-285-0/+10
* | | | | | | | | | am 15938235: Merge "Call getInstanceForPackage instead of creating a new Sens...Aravind Akella2015-07-292-5/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge "Call getInstanceForPackage instead of creating a new SensorManager ins...Aravind Akella2015-07-292-5/+2
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | * | | | | | | | Call getInstanceForPackage instead of creating a new SensorManager instance.Aravind Akella2015-07-272-5/+2
* | | | | | | | | | am 0d210f63: Animation for touch, wake and unlockJorim Jaggi2015-07-2823-131/+420
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Animation for touch, wake and unlockJorim Jaggi2015-07-2823-131/+420
* | | | | | | | | | am 751a96a0: Merge "Don\'t redundantly call transport.finishRestore()" into m...Chris Tate2015-07-281-10/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge "Don't redundantly call transport.finishRestore()" into mnc-devChris Tate2015-07-281-10/+2
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Don't redundantly call transport.finishRestore()Christopher Tate2015-07-281-10/+2
* | | | | | | | | | | am 5faa0336: Merge "Add filter for personal apps that are not disabled until ...Zach Johnson2015-07-281-0/+15
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge "Add filter for personal apps that are not disabled until first use" in...Zach Johnson2015-07-281-0/+15
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Add filter for personal apps that are not disabled until first useZach Johnson2015-07-241-0/+15
* | | | | | | | | | | | am f2c616ed: Merge "Partially revert package freezing" into mnc-devTodd Kennedy2015-07-281-29/+19
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge "Partially revert package freezing" into mnc-devTodd Kennedy2015-07-281-29/+19
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Partially revert package freezingTodd Kennedy2015-07-281-29/+19
| | | |_|/ / / / / / / | | |/| | | | | | | |
* | | | | | | | | | | am bdbec480: Merge "Add "Call subject" capability to phone accounts." into mn...Tyler Gunn2015-07-283-0/+11
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge "Add "Call subject" capability to phone accounts." into mnc-devTyler Gunn2015-07-283-0/+11
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | |
| | * | | | | | | | | Add "Call subject" capability to phone accounts.Tyler Gunn2015-07-273-0/+11
* | | | | | | | | | | am 3551a59b: Merge "Work on issue #21516866: Implement voice interaction in R...Dianne Hackborn2015-07-2810-6/+337
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge "Work on issue #21516866: Implement voice interaction in ResolverActivi...Dianne Hackborn2015-07-2810-6/+337
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Work on issue #21516866: Implement voice interaction in ResolverActivityDianne Hackborn2015-07-2810-6/+337