Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | | am b0e9e731: am bce3eb22: Merge "Fix incorrect default wifi power draw values... | Mitchell Wills | 2015-08-05 | 3 | -4/+16 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | am bce3eb22: Merge "Fix incorrect default wifi power draw values" into mnc-dev | Mitchell Wills | 2015-08-05 | 3 | -4/+16 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | Merge "Fix incorrect default wifi power draw values" into mnc-dev | Mitchell Wills | 2015-08-05 | 3 | -4/+16 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | Fix incorrect default wifi power draw values | Mitchell Wills | 2015-08-04 | 3 | -4/+16 | |
| | | | |_|_|_|_|/ / / / / | | | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | | | am 01496367: am ab868eff: Merge "Update javadoc for EXTRA_PROVISIONING_ADMIN_... | Rubin Xu | 2015-08-05 | 1 | -3/+11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | am ab868eff: Merge "Update javadoc for EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE... | Rubin Xu | 2015-08-05 | 1 | -3/+11 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | Merge "Update javadoc for EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE" into mnc-dev | Rubin Xu | 2015-08-05 | 1 | -3/+11 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | Update javadoc for EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE | Rubin Xu | 2015-08-05 | 1 | -3/+11 | |
* | | | | | | | | | | | | | | am a29e0501: am 86ee3a57: Merge "READ_SMS allows getLine1Number() [1/3]" into... | Makoto Onuki | 2015-08-05 | 1 | -0/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | am 86ee3a57: Merge "READ_SMS allows getLine1Number() [1/3]" into mnc-dev | Makoto Onuki | 2015-08-05 | 1 | -0/+4 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | Merge "READ_SMS allows getLine1Number() [1/3]" into mnc-dev | Makoto Onuki | 2015-08-05 | 1 | -0/+4 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | READ_SMS allows getLine1Number() [1/3] | Makoto Onuki | 2015-08-03 | 1 | -0/+4 | |
* | | | | | | | | | | | | | | | am a02bd53e: am 6bdc4637: Merge "NPE occured when trying to parcel voice feat... | Niels Egberts | 2015-08-05 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | am 6bdc4637: Merge "NPE occured when trying to parcel voice features." into m... | Niels Egberts | 2015-08-05 | 1 | -1/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | Merge "NPE occured when trying to parcel voice features." into mnc-dev | Niels Egberts | 2015-08-05 | 1 | -1/+2 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | NPE occured when trying to parcel voice features. | Niels Egberts | 2015-08-05 | 1 | -1/+2 | |
* | | | | | | | | | | | | | | | am 4d2eec14: am df5a6611: Merge "Revert "Revert "Permissions: GET_ACCOUNTS pe... | Ian Pedowitz | 2015-08-05 | 3 | -127/+199 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | am df5a6611: Merge "Revert "Revert "Permissions: GET_ACCOUNTS permission clea... | Ian Pedowitz | 2015-08-05 | 3 | -127/+199 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | | | | | | | | | | | / / / / | | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | Merge "Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""" into m... | Ian Pedowitz | 2015-08-05 | 3 | -127/+199 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup"" | Ian Pedowitz | 2015-08-05 | 3 | -127/+199 | |
| | | | |/ / / / / / / / / | | | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | | | am e229337b: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | Geoff Mendal | 2015-08-05 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | Geoff Mendal | 2015-08-05 | 7 | -26/+26 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | Import translations. DO NOT MERGE | Geoff Mendal | 2015-08-05 | 7 | -26/+26 | |
* | | | | | | | | | | | | | | am 90b69615: (-s ours) Import translations. DO NOT MERGE | Geoff Mendal | 2015-08-05 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | Import translations. DO NOT MERGE | Geoff Mendal | 2015-08-05 | 1 | -4/+2 | |
| |/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | am 86e7d135: resolved conflicts for merge of dbc4edcc to mnc-dr-dev | Paul Jensen | 2015-08-05 | 7 | -42/+111 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | resolved conflicts for merge of dbc4edcc to mnc-dr-dev | Paul Jensen | 2015-08-05 | 7 | -42/+111 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | Merge "Fix NOT_RESTRICTED network capability and enforce it." into mnc-dev | Paul Jensen | 2015-08-05 | 7 | -46/+120 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | Fix NOT_RESTRICTED network capability and enforce it. | Paul Jensen | 2015-08-04 | 7 | -46/+120 | |
* | | | | | | | | | | | | | | am 815a6b6b: am 519adb50: Merge "Create a special CONSTRAINED font bucket in ... | Roozbeh Pournader | 2015-08-05 | 1 | -4/+20 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | am 519adb50: Merge "Create a special CONSTRAINED font bucket in frameworks." ... | Roozbeh Pournader | 2015-08-05 | 1 | -4/+20 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | Merge "Create a special CONSTRAINED font bucket in frameworks." into mnc-dev | Roozbeh Pournader | 2015-08-05 | 1 | -4/+20 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | Create a special CONSTRAINED font bucket in frameworks. | Roozbeh Pournader | 2015-08-04 | 1 | -4/+20 | |
* | | | | | | | | | | | | | | | am 3832b13c: am 54cea234: Merge "Boot loop when SSID has non UTF-8 character ... | xin He | 2015-08-05 | 2 | -5/+13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | am 54cea234: Merge "Boot loop when SSID has non UTF-8 character in the name" ... | xin He | 2015-08-05 | 2 | -5/+13 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | Merge "Boot loop when SSID has non UTF-8 character in the name" into mnc-dev | xin He | 2015-08-05 | 2 | -5/+13 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | Boot loop when SSID has non UTF-8 character in the name | xinhe | 2015-07-31 | 2 | -5/+13 | |
* | | | | | | | | | | | | | | | | am c632313e: am 2094a702: Merge "Unregister the existing callback when MediaP... | Jae Seo | 2015-08-05 | 1 | -5/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | am 2094a702: Merge "Unregister the existing callback when MediaProjection sto... | Jae Seo | 2015-08-05 | 1 | -5/+8 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | Merge "Unregister the existing callback when MediaProjection stops" into mnc-dev | Jae Seo | 2015-08-05 | 1 | -5/+8 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | Unregister the existing callback when MediaProjection stops | Jae Seo | 2015-08-04 | 1 | -5/+8 | |
* | | | | | | | | | | | | | | | | | am 64e26348: am 0d616883: Merge "Fix moving of apps into legacy ASEC." into m... | Jeff Sharkey | 2015-08-04 | 1 | -10/+18 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | am 0d616883: Merge "Fix moving of apps into legacy ASEC." into mnc-dev | Jeff Sharkey | 2015-08-04 | 1 | -10/+18 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | Merge "Fix moving of apps into legacy ASEC." into mnc-dev | Jeff Sharkey | 2015-08-04 | 1 | -10/+18 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | Fix moving of apps into legacy ASEC. | Jeff Sharkey | 2015-08-03 | 1 | -10/+18 | |
* | | | | | | | | | | | | | | | | | am 841d7b75: am 52d3312a: Merge "Make ResourceKey always use non-null configu... | Filip Gruszczynski | 2015-08-04 | 1 | -12/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | am 52d3312a: Merge "Make ResourceKey always use non-null configuration overri... | Filip Gruszczynski | 2015-08-04 | 1 | -12/+9 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | Merge "Make ResourceKey always use non-null configuration override." into mnc... | Filip Gruszczynski | 2015-08-04 | 1 | -12/+9 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | Make ResourceKey always use non-null configuration override. | Filip Gruszczynski | 2015-08-04 | 1 | -12/+9 | |
| | | | |_|_|_|_|/ / / / / / / / / | | | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | am e8c888c4: am 385dfd34: Merge "Charge apps for wifi tx time while scanning"... | Mitchell Wills | 2015-08-04 | 1 | -14/+32 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |