summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am a7a65ee4: Merge "Allow non system to set perm policy flags - needed by the...Svetoslav Ganov2015-07-291-2/+0
|\
| * Merge "Allow non system to set perm policy flags - needed by the installer" i...Svetoslav Ganov2015-07-291-2/+0
| |\
| | * Allow non system to set perm policy flags - needed by the installerSvet Ganov2015-07-291-2/+0
* | | am 120a86ac: Merge "Do not reset runtime permissions on upgrade" into mnc-devSvetoslav Ganov2015-07-291-1/+1
|\ \ \ | |/ /
| * | Merge "Do not reset runtime permissions on upgrade" into mnc-devSvetoslav Ganov2015-07-291-1/+1
| |\ \
| | * | Do not reset runtime permissions on upgradeSvet Ganov2015-07-291-1/+1
| | |/
* | | am eda1cc50: Merge "Work on issue #22765972: Binder transactions running out ...Dianne Hackborn2015-07-293-6/+12
|\ \ \ | |/ /
| * | Merge "Work on issue #22765972: Binder transactions running out of address......Dianne Hackborn2015-07-293-6/+12
| |\ \
| | * | Work on issue #22765972: Binder transactions running out of address...Dianne Hackborn2015-07-283-6/+12
* | | | am 64ac302f: Merge "Send a public broadcast when the device owner is set." in...Nicolas Prévot2015-07-295-1/+22
|\ \ \ \ | |/ / /
| * | | Merge "Send a public broadcast when the device owner is set." into mnc-devNicolas Prévot2015-07-295-1/+22
| |\ \ \
| | * | | Send a public broadcast when the device owner is set.Nicolas Prevot2015-07-285-1/+22
* | | | | am 1bd310e1: Merge "import more metrics enums" into mnc-devChris Wren2015-07-292-14/+13
|\ \ \ \ \ | |/ / / /
| * | | | Merge "import more metrics enums" into mnc-devChris Wren2015-07-292-14/+13
| |\ \ \ \
| | * | | | import more metrics enumsChris Wren2015-07-282-14/+13
* | | | | | Merge "Import translations. DO NOT MERGE" into mnc-dr-devGeoff Mendal2015-07-2978-33/+131
|\ \ \ \ \ \
| * | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-07-2978-33/+131
* | | | | | | resolved conflicts for merge of 30813942 to mnc-dr-devPaul Jensen2015-07-292-8/+24
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge "Disable WiFi autojoin when user decides via "Stay connected?" dialog" ...Paul Jensen2015-07-292-8/+25
| |\ \ \ \ \ \
| | * | | | | | Disable WiFi autojoin when user decides via "Stay connected?" dialogPaul Jensen2015-07-162-8/+25
* | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-dr-devGeoff Mendal2015-07-2978-0/+102
|\ \ \ \ \ \ \ \
| * | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-07-2978-0/+102
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-dr-devGeoff Mendal2015-07-297-16/+16
|\ \ \ \ \ \ \ \
| * | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-07-297-16/+16
| |/ / / / / / /
* | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-dr-devGeoff Mendal2015-07-291-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-07-291-1/+1
| |/ / / / / / /
* | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-07-291-1/+1
|/ / / / / / /
* | | | | | | 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
| |\ \ \ \ \ \ \ \ \