Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am 7157c2ca: Merge "Revert "Call getInstanceForPackage instead of creating a ... | Narayan Kamath | 2015-07-29 | 2 | -2/+5 |
|\ | |||||
| * | Merge "Revert "Call getInstanceForPackage instead of creating a new SensorMan... | Narayan Kamath | 2015-07-29 | 2 | -2/+5 |
| |\ | |||||
| | * | Revert "Call getInstanceForPackage instead of creating a new SensorManager in... | Narayan Kamath | 2015-07-29 | 2 | -2/+5 |
* | | | am 50184147: Merge "Resource for setting default NFC payment component." into... | Martijn Coenen | 2015-07-29 | 2 | -1/+21 |
|\ \ \ | |/ / | |||||
| * | | Merge "Resource for setting default NFC payment component." into mnc-dev | Martijn Coenen | 2015-07-29 | 2 | -1/+21 |
| |\ \ | |||||
| | * | | Resource for setting default NFC payment component. | Martijn Coenen | 2015-07-27 | 2 | -1/+21 |
* | | | | am a7b4d6dc: Merge "Keymaster digest/padding NONE no longer means ANY." into ... | Shawn Willden | 2015-07-29 | 5 | -55/+65 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge "Keymaster digest/padding NONE no longer means ANY." into mnc-dev | Shawn Willden | 2015-07-29 | 5 | -55/+65 |
| |\ \ \ | |||||
| | * | | | Keymaster digest/padding NONE no longer means ANY. | Alex Klyubin | 2015-07-28 | 5 | -55/+65 |
* | | | | | am b8040265: Merge "Give secondary users read-only physical cards." into mnc-dev | Jeff Sharkey | 2015-07-29 | 5 | -17/+52 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge "Give secondary users read-only physical cards." into mnc-dev | Jeff Sharkey | 2015-07-29 | 5 | -17/+52 |
| |\ \ \ \ | |||||
| | * | | | | Give secondary users read-only physical cards. | Jeff Sharkey | 2015-07-28 | 5 | -17/+52 |
* | | | | | | am 02022b70: Merge "media: fix estimateFrameRatesFor to use correct ratio" in... | Ronghua Wu | 2015-07-29 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge "media: fix estimateFrameRatesFor to use correct ratio" into mnc-dev | Ronghua Wu | 2015-07-29 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| | * | | | | | media: fix estimateFrameRatesFor to use correct ratio | Ronghua Wu | 2015-07-28 | 1 | -1/+1 |
* | | | | | | | am b310c894: Merge "Fix issue #22802691: APR: NPE in ActivityRecord" into mnc... | Dianne Hackborn | 2015-07-29 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge "Fix issue #22802691: APR: NPE in ActivityRecord" into mnc-dev | Dianne Hackborn | 2015-07-29 | 1 | -2/+2 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Fix issue #22802691: APR: NPE in ActivityRecord | Dianne Hackborn | 2015-07-28 | 1 | -2/+2 |
* | | | | | | | | am 5b009d52: Merge "Fix issue #22802617: APR: spurious wtf when restarting a ... | Dianne Hackborn | 2015-07-29 | 1 | -1/+4 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge "Fix issue #22802617: APR: spurious wtf when restarting a persistent pr... | Dianne Hackborn | 2015-07-29 | 1 | -1/+4 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Fix issue #22802617: APR: spurious wtf when restarting a persistent process | Dianne Hackborn | 2015-07-28 | 1 | -1/+4 |
| | |/ / / / / / | |||||
* | | | | | | | | am b492ced8: Merge "Fix issue #22802782: APR: NPE in package manager with bad... | Dianne Hackborn | 2015-07-29 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge "Fix issue #22802782: APR: NPE in package manager with bad intent data"... | Dianne Hackborn | 2015-07-29 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Fix issue #22802782: APR: NPE in package manager with bad intent data | Dianne Hackborn | 2015-07-28 | 1 | -2/+2 |
| | |/ / / / / / | |||||
* | | | | | | | | am c96e6f19: Merge "BatteryStats: Use proper power calculator when energy dat... | Adam Lesinski | 2015-07-29 | 1 | -12/+17 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge "BatteryStats: Use proper power calculator when energy data is received... | Adam Lesinski | 2015-07-29 | 1 | -12/+17 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | BatteryStats: Use proper power calculator when energy data is received | Adam Lesinski | 2015-07-28 | 1 | -12/+17 |
* | | | | | | | | | am fbcbad13: Merge "Add sizes to SysUI tests" into mnc-dev | Jason Monk | 2015-07-29 | 5 | -0/+10 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Merge "Add sizes to SysUI tests" into mnc-dev | Jason Monk | 2015-07-29 | 5 | -0/+10 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Add sizes to SysUI tests | Jason Monk | 2015-07-28 | 5 | -0/+10 |
* | | | | | | | | | | am 15938235: Merge "Call getInstanceForPackage instead of creating a new Sens... | Aravind Akella | 2015-07-29 | 2 | -5/+2 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | Merge "Call getInstanceForPackage instead of creating a new SensorManager ins... | Aravind Akella | 2015-07-29 | 2 | -5/+2 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | |||||
| | * | | | | | | | | Call getInstanceForPackage instead of creating a new SensorManager instance. | Aravind Akella | 2015-07-27 | 2 | -5/+2 |
* | | | | | | | | | | am 0d210f63: Animation for touch, wake and unlock | Jorim Jaggi | 2015-07-28 | 23 | -131/+420 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | Animation for touch, wake and unlock | Jorim Jaggi | 2015-07-28 | 23 | -131/+420 |
* | | | | | | | | | | am 751a96a0: Merge "Don\'t redundantly call transport.finishRestore()" into m... | Chris Tate | 2015-07-28 | 1 | -10/+2 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | Merge "Don't redundantly call transport.finishRestore()" into mnc-dev | Chris Tate | 2015-07-28 | 1 | -10/+2 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Don't redundantly call transport.finishRestore() | Christopher Tate | 2015-07-28 | 1 | -10/+2 |
* | | | | | | | | | | | am 5faa0336: Merge "Add filter for personal apps that are not disabled until ... | Zach Johnson | 2015-07-28 | 1 | -0/+15 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | Merge "Add filter for personal apps that are not disabled until first use" in... | Zach Johnson | 2015-07-28 | 1 | -0/+15 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Add filter for personal apps that are not disabled until first use | Zach Johnson | 2015-07-24 | 1 | -0/+15 |
* | | | | | | | | | | | | am f2c616ed: Merge "Partially revert package freezing" into mnc-dev | Todd Kennedy | 2015-07-28 | 1 | -29/+19 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | Merge "Partially revert package freezing" into mnc-dev | Todd Kennedy | 2015-07-28 | 1 | -29/+19 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | Partially revert package freezing | Todd Kennedy | 2015-07-28 | 1 | -29/+19 |
| | | |_|/ / / / / / / | | |/| | | | | | | | | |||||
* | | | | | | | | | | | am bdbec480: Merge "Add "Call subject" capability to phone accounts." into mn... | Tyler Gunn | 2015-07-28 | 3 | -0/+11 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | Merge "Add "Call subject" capability to phone accounts." into mnc-dev | Tyler Gunn | 2015-07-28 | 3 | -0/+11 |
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | | | |||||
| | * | | | | | | | | | Add "Call subject" capability to phone accounts. | Tyler Gunn | 2015-07-27 | 3 | -0/+11 |
* | | | | | | | | | | | am 3551a59b: Merge "Work on issue #21516866: Implement voice interaction in R... | Dianne Hackborn | 2015-07-28 | 10 | -6/+337 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | Merge "Work on issue #21516866: Implement voice interaction in ResolverActivi... | Dianne Hackborn | 2015-07-28 | 10 | -6/+337 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Work on issue #21516866: Implement voice interaction in ResolverActivity | Dianne Hackborn | 2015-07-28 | 10 | -6/+337 |