Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am a7a65ee4: Merge "Allow non system to set perm policy flags - needed by the... | Svetoslav Ganov | 2015-07-29 | 1 | -2/+0 |
|\ | |||||
| * | Merge "Allow non system to set perm policy flags - needed by the installer" i... | Svetoslav Ganov | 2015-07-29 | 1 | -2/+0 |
| |\ | |||||
| | * | Allow non system to set perm policy flags - needed by the installer | Svet Ganov | 2015-07-29 | 1 | -2/+0 |
* | | | am 120a86ac: Merge "Do not reset runtime permissions on upgrade" into mnc-dev | Svetoslav Ganov | 2015-07-29 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge "Do not reset runtime permissions on upgrade" into mnc-dev | Svetoslav Ganov | 2015-07-29 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Do not reset runtime permissions on upgrade | Svet Ganov | 2015-07-29 | 1 | -1/+1 |
| | |/ | |||||
* | | | am eda1cc50: Merge "Work on issue #22765972: Binder transactions running out ... | Dianne Hackborn | 2015-07-29 | 3 | -6/+12 |
|\ \ \ | |/ / | |||||
| * | | Merge "Work on issue #22765972: Binder transactions running out of address...... | Dianne Hackborn | 2015-07-29 | 3 | -6/+12 |
| |\ \ | |||||
| | * | | Work on issue #22765972: Binder transactions running out of address... | Dianne Hackborn | 2015-07-28 | 3 | -6/+12 |
* | | | | am 64ac302f: Merge "Send a public broadcast when the device owner is set." in... | Nicolas Prévot | 2015-07-29 | 5 | -1/+22 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge "Send a public broadcast when the device owner is set." into mnc-dev | Nicolas Prévot | 2015-07-29 | 5 | -1/+22 |
| |\ \ \ | |||||
| | * | | | Send a public broadcast when the device owner is set. | Nicolas Prevot | 2015-07-28 | 5 | -1/+22 |
* | | | | | am 1bd310e1: Merge "import more metrics enums" into mnc-dev | Chris Wren | 2015-07-29 | 2 | -14/+13 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge "import more metrics enums" into mnc-dev | Chris Wren | 2015-07-29 | 2 | -14/+13 |
| |\ \ \ \ | |||||
| | * | | | | import more metrics enums | Chris Wren | 2015-07-28 | 2 | -14/+13 |
* | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | Geoff Mendal | 2015-07-29 | 78 | -33/+131 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Import translations. DO NOT MERGE | Geoff Mendal | 2015-07-29 | 78 | -33/+131 |
* | | | | | | | resolved conflicts for merge of 30813942 to mnc-dr-dev | Paul Jensen | 2015-07-29 | 2 | -8/+24 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Merge "Disable WiFi autojoin when user decides via "Stay connected?" dialog" ... | Paul Jensen | 2015-07-29 | 2 | -8/+25 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Disable WiFi autojoin when user decides via "Stay connected?" dialog | Paul Jensen | 2015-07-16 | 2 | -8/+25 |
* | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | Geoff Mendal | 2015-07-29 | 78 | -0/+102 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Import translations. DO NOT MERGE | Geoff Mendal | 2015-07-29 | 78 | -0/+102 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | Geoff Mendal | 2015-07-29 | 7 | -16/+16 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Import translations. DO NOT MERGE | Geoff Mendal | 2015-07-29 | 7 | -16/+16 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | Geoff Mendal | 2015-07-29 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Import translations. DO NOT MERGE | Geoff Mendal | 2015-07-29 | 1 | -1/+1 |
| |/ / / / / / / | |||||
* | | | | | | | | Import translations. DO NOT MERGE | Geoff Mendal | 2015-07-29 | 1 | -1/+1 |
|/ / / / / / / | |||||
* | | | | | | | 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 |
| |\ \ \ \ \ \ \ \ \ |