summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | am b0e9e731: am bce3eb22: Merge "Fix incorrect default wifi power draw values...Mitchell Wills2015-08-053-4/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | am bce3eb22: Merge "Fix incorrect default wifi power draw values" into mnc-devMitchell Wills2015-08-053-4/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Merge "Fix incorrect default wifi power draw values" into mnc-devMitchell Wills2015-08-053-4/+16
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Fix incorrect default wifi power draw valuesMitchell Wills2015-08-043-4/+16
| | | | |_|_|_|_|/ / / / / | | | |/| | | | | | | | |
* | | | | | | | | | | | | am 01496367: am ab868eff: Merge "Update javadoc for EXTRA_PROVISIONING_ADMIN_...Rubin Xu2015-08-051-3/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | am ab868eff: Merge "Update javadoc for EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE...Rubin Xu2015-08-051-3/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Merge "Update javadoc for EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE" into mnc-devRubin Xu2015-08-051-3/+11
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Update javadoc for EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLERubin Xu2015-08-051-3/+11
* | | | | | | | | | | | | | am a29e0501: am 86ee3a57: Merge "READ_SMS allows getLine1Number() [1/3]" into...Makoto Onuki2015-08-051-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | am 86ee3a57: Merge "READ_SMS allows getLine1Number() [1/3]" into mnc-devMakoto Onuki2015-08-051-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | Merge "READ_SMS allows getLine1Number() [1/3]" into mnc-devMakoto Onuki2015-08-051-0/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | READ_SMS allows getLine1Number() [1/3]Makoto Onuki2015-08-031-0/+4
* | | | | | | | | | | | | | | am a02bd53e: am 6bdc4637: Merge "NPE occured when trying to parcel voice feat...Niels Egberts2015-08-051-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | am 6bdc4637: Merge "NPE occured when trying to parcel voice features." into m...Niels Egberts2015-08-051-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | Merge "NPE occured when trying to parcel voice features." into mnc-devNiels Egberts2015-08-051-1/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | NPE occured when trying to parcel voice features.Niels Egberts2015-08-051-1/+2
* | | | | | | | | | | | | | | am 4d2eec14: am df5a6611: Merge "Revert "Revert "Permissions: GET_ACCOUNTS pe...Ian Pedowitz2015-08-053-127/+199
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | am df5a6611: Merge "Revert "Revert "Permissions: GET_ACCOUNTS permission clea...Ian Pedowitz2015-08-053-127/+199
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | | | | | | | | | | | / / / / | | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge "Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""" into m...Ian Pedowitz2015-08-053-127/+199
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""Ian Pedowitz2015-08-053-127/+199
| | | | |/ / / / / / / / / | | | |/| | | | | | | | |
* | | | | | | | | | | | | am e229337b: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-devGeoff Mendal2015-08-050-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-dr-devGeoff Mendal2015-08-057-26/+26
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-08-057-26/+26
* | | | | | | | | | | | | | am 90b69615: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-050-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-08-051-4/+2
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | am 86e7d135: resolved conflicts for merge of dbc4edcc to mnc-dr-devPaul Jensen2015-08-057-42/+111
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | resolved conflicts for merge of dbc4edcc to mnc-dr-devPaul Jensen2015-08-057-42/+111
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Merge "Fix NOT_RESTRICTED network capability and enforce it." into mnc-devPaul Jensen2015-08-057-46/+120
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Fix NOT_RESTRICTED network capability and enforce it.Paul Jensen2015-08-047-46/+120
* | | | | | | | | | | | | | am 815a6b6b: am 519adb50: Merge "Create a special CONSTRAINED font bucket in ...Roozbeh Pournader2015-08-051-4/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | am 519adb50: Merge "Create a special CONSTRAINED font bucket in frameworks." ...Roozbeh Pournader2015-08-051-4/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | Merge "Create a special CONSTRAINED font bucket in frameworks." into mnc-devRoozbeh Pournader2015-08-051-4/+20
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Create a special CONSTRAINED font bucket in frameworks.Roozbeh Pournader2015-08-041-4/+20
* | | | | | | | | | | | | | | am 3832b13c: am 54cea234: Merge "Boot loop when SSID has non UTF-8 character ...xin He2015-08-052-5/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | am 54cea234: Merge "Boot loop when SSID has non UTF-8 character in the name" ...xin He2015-08-052-5/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | Merge "Boot loop when SSID has non UTF-8 character in the name" into mnc-devxin He2015-08-052-5/+13
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Boot loop when SSID has non UTF-8 character in the namexinhe2015-07-312-5/+13
* | | | | | | | | | | | | | | | am c632313e: am 2094a702: Merge "Unregister the existing callback when MediaP...Jae Seo2015-08-051-5/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | am 2094a702: Merge "Unregister the existing callback when MediaProjection sto...Jae Seo2015-08-051-5/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | Merge "Unregister the existing callback when MediaProjection stops" into mnc-devJae Seo2015-08-051-5/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | Unregister the existing callback when MediaProjection stopsJae Seo2015-08-041-5/+8
* | | | | | | | | | | | | | | | | am 64e26348: am 0d616883: Merge "Fix moving of apps into legacy ASEC." into m...Jeff Sharkey2015-08-041-10/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | am 0d616883: Merge "Fix moving of apps into legacy ASEC." into mnc-devJeff Sharkey2015-08-041-10/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | Merge "Fix moving of apps into legacy ASEC." into mnc-devJeff Sharkey2015-08-041-10/+18
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Fix moving of apps into legacy ASEC.Jeff Sharkey2015-08-031-10/+18
* | | | | | | | | | | | | | | | | am 841d7b75: am 52d3312a: Merge "Make ResourceKey always use non-null configu...Filip Gruszczynski2015-08-041-12/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | am 52d3312a: Merge "Make ResourceKey always use non-null configuration overri...Filip Gruszczynski2015-08-041-12/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | Merge "Make ResourceKey always use non-null configuration override." into mnc...Filip Gruszczynski2015-08-041-12/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | Make ResourceKey always use non-null configuration override.Filip Gruszczynski2015-08-041-12/+9
| | | | |_|_|_|_|/ / / / / / / / / | | | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | am e8c888c4: am 385dfd34: Merge "Charge apps for wifi tx time while scanning"...Mitchell Wills2015-08-041-14/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / /