summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | am c7e94b04: am 037c8118: am 6355e115: am 77a2e3d6: am 3a3ff591: am a6c8a0e6:...Fyodor Kupolov2015-01-290-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | am 037c8118: am 6355e115: am 77a2e3d6: am 3a3ff591: am a6c8a0e6: am d8b606b8:...Fyodor Kupolov2015-01-290-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | am 6355e115: am 77a2e3d6: am 3a3ff591: am a6c8a0e6: am d8b606b8: am 2f3bc3cb:...Fyodor Kupolov2015-01-290-0/+0
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / /
| | | | * | | | | | | am 77a2e3d6: am 3a3ff591: am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am...Fyodor Kupolov2015-01-290-0/+0
| | | | |\ \ \ \ \ \ \ | | | | | |/ / / / / /
| | | | | * | | | | | am 3a3ff591: am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am...Fyodor Kupolov2015-01-290-0/+0
| | | | | |\ \ \ \ \ \ | | | | | | | |_|_|/ / | | | | | | |/| | | |
| | | | | | * | | | | am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Ad...Fyodor Kupolov2015-01-290-0/+0
| | | | | | |\ \ \ \ \ | | | | | | | |_|/ / / | | | | | | |/| | | |
| | | | | | | * | | | am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check i...Fyodor Kupolov2015-01-290-0/+0
| | | | | | | |\ \ \ \
| | | | | | | | * \ \ \ am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom ac...Fyodor Kupolov2015-01-290-0/+0
| | | | | | | | |\ \ \ \
| | | | | | | | | * \ \ \ am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be startedFyodor Kupolov2015-01-291-0/+21
| | | | | | | | | |\ \ \ \
| | | | | | | | | | * \ \ \ am e8e7b9b3: Added a check if a custom activity can be startedFyodor Kupolov2015-01-291-0/+21
| | | | | | | | | | |\ \ \ \
| | | | | | | | | | | * | | | Added a check if a custom activity can be startedFyodor Kupolov2015-01-281-0/+21
* | | | | | | | | | | | | | | am 5cf685fa: am d5fcd896: am 9fce9185: am bd89b7b4: am 0d5ad3b7: am 57641a8b:...Fyodor Kupolov2015-01-290-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | am d5fcd896: am 9fce9185: am bd89b7b4: am 0d5ad3b7: am 57641a8b: am d7e93570:...Fyodor Kupolov2015-01-290-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | am 9fce9185: am bd89b7b4: am 0d5ad3b7: am 57641a8b: am d7e93570: am f11f9f47:...Fyodor Kupolov2015-01-290-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / /
| | | * | | | | | | | | | | | am bd89b7b4: am 0d5ad3b7: am 57641a8b: am d7e93570: am f11f9f47: Added a chec...Fyodor Kupolov2015-01-290-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / /
| | | | * | | | | | | | | | | am 0d5ad3b7: am 57641a8b: am d7e93570: am f11f9f47: Added a check if a custom...Fyodor Kupolov2015-01-291-0/+21
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / /
| | | | | * | | | | | | | | | am 57641a8b: am d7e93570: am f11f9f47: Added a check if a custom activity can...Fyodor Kupolov2015-01-291-0/+21
| | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / /
| | | | | | * | | | | | | | | am d7e93570: am f11f9f47: Added a check if a custom activity can be startedFyodor Kupolov2015-01-291-0/+21
| | | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / /
| | | | | | | * | | | | | | | am f11f9f47: Added a check if a custom activity can be startedFyodor Kupolov2015-01-291-0/+21
| | | | | | | |\ \ \ \ \ \ \ \ | | | | | | | | |/ / / / / / /
| | | | | | | | * | | | | | | Added a check if a custom activity can be startedFyodor Kupolov2015-01-281-0/+21
* | | | | | | | | | | | | | | Merge "Use primaryUserOnly attribute to disable CryptKeeper"Fyodor Kupolov2015-01-282-24/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Use primaryUserOnly attribute to disable CryptKeeperFyodor Kupolov2015-01-272-24/+5
| | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | resolved conflicts for merge of 23682809 to lmp-mr1-dev-plus-aospPavel Zhamaitsiak2015-01-284-1/+66
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | resolved conflicts for merge of 23682809 to lmp-mr1-dev-plus-aospPavel Zhamaitsiak2015-01-284-1/+66
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge "Add button in "hidden" settings to flip "VoLTE Provisioned" flag" into...Pavel Zhamaitsiak2015-01-284-1/+66
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | Merge "Add button in "hidden" settings to flip "VoLTE Provisioned" flag" into...Pavel Zhamaitsiak2015-01-284-1/+66
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | Add button in "hidden" settings to flip "VoLTE Provisioned" flagPavel Zhamaitsiak2015-01-224-1/+66
* | | | | | | | | | | | | | | | am 318a0601: (-s ours) am 41d5cb0c: (-s ours) am b5ad15ae: (-s ours) Import t...Geoff Mendal2015-01-280-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | am 41d5cb0c: (-s ours) am b5ad15ae: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-01-280-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | am b5ad15ae: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-01-280-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / /
| | | * | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-01-283-34/+34
* | | | | | | | | | | | | | | | am 34f67e45: (-s ours) am fcfec915: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-01-280-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | am fcfec915: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-01-280-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-01-283-34/+34
* | | | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-01-287-38/+38
* | | | | | | | | | | | | | | | am c0570dc4: am 271aa608: am 09c9e5eb: [DS] Correct the access method for...Mick Lin2015-01-272-6/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | am 271aa608: am 09c9e5eb: [DS] Correct the access method for telephony sy...Mick Lin2015-01-272-6/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | am 09c9e5eb: [DS] Correct the access method for telephony system propertyMick Lin2015-01-272-6/+13
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / /
| | | * | | | | | | | | | | | | [DS] Correct the access method for telephony system propertyMick Lin2015-01-272-6/+13
* | | | | | | | | | | | | | | | am 78ab1669: am 4ec2b9e6: am 9c167e92: Fix secondary data usage color regress...Jeff Sharkey2015-01-261-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | / / / / / / / / / / / | |_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | am 4ec2b9e6: am 9c167e92: Fix secondary data usage color regression.Jeff Sharkey2015-01-261-2/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | am 9c167e92: Fix secondary data usage color regression.Jeff Sharkey2015-01-261-2/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / /
| | | * | | | | | | | | | | | Fix secondary data usage color regression.Jeff Sharkey2015-01-261-2/+4
* | | | | | | | | | | | | | | am 849673ed: (-s ours) am 26a3e949: (-s ours) Import translations. DO NOT MER...Geoff Mendal2015-01-260-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | am 26a3e949: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-01-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | am 26a3e949: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-01-260-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / /
| | | * | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-01-263-4/+4
* | | | | | | | | | | | | | | am 956fb8ca: (-s ours) Import translations. DO NOT MERGE automerge: f916950 ...Geoff Mendal2015-01-260-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-01-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-01-263-4/+4