summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/pa...staging/cm-13.0+r22Steve Kondik2016-03-11131-656/+454
|\
| * Merge "DO NOT MERGE Make android.intent.action.EMERGENCY_CALL_STATE_CHANGED p...Amit Mahajan2016-01-141-0/+1
| |\
| | * DO NOT MERGE Make android.intent.action.EMERGENCY_CALL_STATE_CHANGED protectedAmit Mahajan2016-01-141-0/+1
| * | Import translations. DO NOT MERGE am: 18f85e2e47 -s ours am: bc599c4e34 -s ...Geoff Mendal2016-01-130-0/+0
| |\ \
| | * \ Import translations. DO NOT MERGE am: 18f85e2e47 -s oursGeoff Mendal2016-01-130-0/+0
| | |\ \
| | | * \ Import translations. DO NOT MERGEGeoff Mendal2016-01-130-0/+0
| | | |\ \
| | | | * | Import translations. DO NOT MERGEGeoff Mendal2016-01-1283-962/+687
| * | | | | Merge "Fix potential ClassCastException." into mnc-dr1.5-devTyler Gunn2016-01-121-4/+6
| |\ \ \ \ \
| | * | | | | Fix potential ClassCastException.Tyler Gunn2016-01-111-4/+6
| * | | | | | getPreferredNetworkType should return int[] instead of -1 on error.Sanket Padawe2016-01-061-1/+1
| |/ / / / /
| * | | | / Import translations. DO NOT MERGEGeoff Mendal2015-12-231-6/+6
| | |_|_|/ | |/| | |
| * | | | Import translations. DO NOT MERGEGeoff Mendal2015-12-141-1/+1
| * | | | Remove BluetoothManager.Bryce Lee2015-12-075-186/+8
| |\| | |
| | * | | Remove BluetoothManager.Bryce Lee2015-12-045-186/+8
| * | | | Post updateExtras to handler to avoid potential concurrency issue.Tyler Gunn2015-12-071-1/+5
| * | | | Import translations. DO NOT MERGEGeoff Mendal2015-12-0777-2447/+4959
| * | | | Remove TDSCDMA-only menuSungmin Choi2015-12-032-4/+1
| * | | | Import translations. DO NOT MERGE am: 5ca7a9b7cc -s oursGeoff Mendal2015-11-110-0/+0
| |\| | |
| | * | | Import translations. DO NOT MERGEGeoff Mendal2015-11-110-0/+0
| | |\| |
| | | * | Import translations. DO NOT MERGEGeoff Mendal2015-11-111-9/+9
| * | | | Import translations. DO NOT MERGE am: 2dad7c686e -s oursGeoff Mendal2015-11-090-0/+0
| |\| | |
| | * | | Import translations. DO NOT MERGEGeoff Mendal2015-11-090-0/+0
| | |\| |
| | | * | Import translations. DO NOT MERGEGeoff Mendal2015-11-093-33/+33
| * | | | Merge "Revert "Ensure sim contacts import screen supports rotation."" into mn...Tyler Gunn2015-11-051-0/+1
| |\| | |
| | * | | Merge "Revert "Ensure sim contacts import screen supports rotation."" into mn...Tyler Gunn2015-11-051-0/+1
| | |\| |
| | | * | Merge "Revert "Ensure sim contacts import screen supports rotation."" into mn...Tyler Gunn2015-11-051-0/+1
| | | |\ \
| | | | * | Revert "Ensure sim contacts import screen supports rotation."Tyler Gunn2015-11-051-0/+1
| * | | | | Import translations. DO NOT MERGE am: 831ff856b2 -s oursGeoff Mendal2015-11-050-0/+0
| |\| | | |
| | * | | | Import translations. DO NOT MERGEGeoff Mendal2015-11-050-0/+0
| | |\| | |
| | | * | | Import translations. DO NOT MERGEGeoff Mendal2015-11-042-33/+33
| * | | | | Ensure connection extras are propagated on start of call. am: 06f2ca3945Tyler Gunn2015-11-021-0/+1
| |\| | | |
| | * | | | Ensure connection extras are propagated on start of call.Tyler Gunn2015-11-021-0/+1
| | |\| | |
| | | * | | Ensure connection extras are propagated on start of call.Tyler Gunn2015-10-281-0/+1
| * | | | | Import translations. DO NOT MERGE am: 2388cfda63 -s oursGeoff Mendal2015-10-280-0/+0
| |\| | | |
| | * | | | Import translations. DO NOT MERGEGeoff Mendal2015-10-280-0/+0
| | |\| | |
| * | | | | Merge "Allow for PSTN accounts to be marked as not emergency call capable." i...Bryce Lee2015-10-262-1/+7
| |\| | | |
| | * | | | Merge "Allow for PSTN accounts to be marked as not emergency call capable." i...Bryce Lee2015-10-262-1/+7
| | |\ \ \ \
| | | * | | | Allow for PSTN accounts to be marked as not emergency call capable.Bryce Lee2015-10-262-1/+7
| * | | | | | Import translations. DO NOT MERGE am: 0d9e7eba32 -s oursGeoff Mendal2015-10-260-0/+0
| |\| | | | |
| | * | | | | Import translations. DO NOT MERGEGeoff Mendal2015-10-260-0/+0
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | Import translations. DO NOT MERGE am: 049b3bbbeb -s oursGeoff Mendal2015-10-260-0/+0
| |\| | | | |
| | * | | | | Import translations. DO NOT MERGEGeoff Mendal2015-10-260-0/+0
| | |\ \ \ \ \
| * | | | | | | Merge "Fixes Telephony ProgressDialog to use system theme" into cw-e-devAlexander Hills2015-10-221-2/+2
| |\| | | | | |
| | * | | | | | Merge "Fixes Telephony ProgressDialog to use system theme" into cw-e-devAlexander Hills2015-10-221-2/+2
| | |\ \ \ \ \ \
| | | * | | | | | Fixes Telephony ProgressDialog to use system themeAlex Hills2015-10-221-2/+2
| * | | | | | | | Merge "Unregister emergency only telephony phone accounts." into cw-e-devBryce Lee2015-10-222-5/+13
| |\| | | | | | |
| | * | | | | | | Merge "Unregister emergency only telephony phone accounts." into cw-e-devBryce Lee2015-10-222-5/+13
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | Unregister emergency only telephony phone accounts.Bryce Lee2015-10-212-5/+13
| * | | | | | | | Prevent DISCONNECTED unknown connections. am: fff1c1dc2fSantos Cordon2015-10-202-2/+18
| |\| | | | | | |
| | * | | | | | | Prevent DISCONNECTED unknown connections.Santos Cordon2015-10-202-2/+18
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |