summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'android-6.0.1_r22' of ↵staging/cm-13.0+r22Steve Kondik2016-03-1079-1634/+502
|\ | | | | | | | | | | https://android.googlesource.com/platform/packages/apps/InCallUI into cm-13.0 Android 6.0.1 release 22
| * DO NOT MERGE Workaround for java.lang.IllegalArgumentException in ↵Ta-wei Yen2016-01-112-42/+197
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | android.util.ArrayMap b/25613098 sometimes corrupt the bundle, resulting in a IllegalArgumentException while validating. Workaround with abandoning all the information in it. The bypassed code only tries to extract data from the bundle, which can already be null. These are not critical for the dialer to function. Bug:26343012 Bug:25613098 Change-Id: I16b05ecb0e5317f7170d80eb8426b5cdce20f6c2
| * Show child number in incoming call notification. am: 2e5cfc1a71Tyler Gunn2015-11-091-4/+8
| |\ | | | | | | | | | | | | | | | | | | am: 8af424c54d * commit '8af424c54dba1388abb4db929560f19f6e71653d': Show child number in incoming call notification.
| | * Show child number in incoming call notification.Tyler Gunn2015-11-091-4/+8
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | am: 2e5cfc1a71 * commit '2e5cfc1a71942e2ca2c8e469042e82c1b4640476': Show child number in incoming call notification.
| | | * Show child number in incoming call notification.Tyler Gunn2015-11-091-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Where a child number is present in the call extras, show it using the text "via 650-555-1212" in the second line of the incoming call notification. Bug: 24585039 Change-Id: Ic9827f8518778bf5e9c36235e2e1b6525aba4928
| * | | am 3a576b7a: Fix bitmap leaks in InCallUI am: 24ad92950aYorke Lee2015-10-191-1/+5
| |\| | | | | | | | | | | | | | | | | | * commit '3a576b7ab31275801064d2e1875b5fe8e06ea612': Fix bitmap leaks in InCallUI
| | * | Fix bitmap leaks in InCallUIYorke Lee2015-10-191-1/+5
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | am: 24ad92950a * commit '24ad92950a39af862c676f18e07b88ecde2f4e3b': Fix bitmap leaks in InCallUI
| * | | am 9849b290: am 070463fa: Merge "Handle child number changes after the call ↵Tyler Gunn2015-10-075-2/+46
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | starts." into mnc-dr-dev * commit '9849b29079f43a29e65886b0d26d2a07344b8d2a': Handle child number changes after the call starts.
| | * | am 070463fa: Merge "Handle child number changes after the call starts." into ↵Tyler Gunn2015-10-075-2/+46
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dr-dev * commit '070463fa5c8cb252464ad6aae936131f8c939636': Handle child number changes after the call starts.
| * | | | am ad6e03a4: am 568a22f1: Fix potential mismatched caller informationYorke Lee2015-10-061-1/+9
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit 'ad6e03a4087000459bd82b0b49366dcd18117e4b': Fix potential mismatched caller information
| | * | | am 568a22f1: Fix potential mismatched caller informationYorke Lee2015-10-061-1/+9
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '568a22f1d76c83e02b3494a506c21663897d85bb': Fix potential mismatched caller information
| * | | | | am 8b309111: (-s ours) am efabe88a: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8b309111d38d6a48c2dfdfa5a3caa5022b83b066': Import translations. DO NOT MERGE
| | * | | | am efabe88a: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-270-0/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'efabe88a8dc60d6f9187bebc4756f0bdedfcb925': Import translations. DO NOT MERGE
| * | | | | | am f8728f51: (-s ours) am 22509982: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-250-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f8728f516d79400326f130eb81a682320a863ce8': Import translations. DO NOT MERGE
| | * | | | | am 22509982: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-250-0/+0
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2250998246195d1aec3417b5b59935ee1c2634c1': Import translations. DO NOT MERGE
| * | | | | | | am 3a7443b9: (-s ours) am 26d35c71: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-230-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3a7443b97ffe8008e7102f4112c7b0abf8f2eb5a': Import translations. DO NOT MERGE
| | * | | | | | am 26d35c71: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-230-0/+0
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '26d35c71bbc10fffa897d197facec0c19f1f45f8': Import translations. DO NOT MERGE
| * | | | | | | | am 4b52c305: am 126265d8: Merge "Ensure call subject is hidden if disabled ↵Anthony Lee2015-09-223-2/+36
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for carrier." into mnc-dr-dev * commit '4b52c30564e96ee7ce8d6b2b1705d9ca1bf85b4e': Ensure call subject is hidden if disabled for carrier.
| | * | | | | | | am 126265d8: Merge "Ensure call subject is hidden if disabled for carrier." ↵Anthony Lee2015-09-223-2/+36
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dr-dev * commit '126265d89deb187519e0378405606faae82f93ee': Ensure call subject is hidden if disabled for carrier.
| * | | | | | | | | am 94d8b53e: (-s ours) am 7bfb8135: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-190-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '94d8b53ecc8f26e86f84c750ff9b998dd4e09c2c': Import translations. DO NOT MERGE
| | * | | | | | | | am 7bfb8135: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-190-0/+0
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7bfb8135bfa441da8f18bd62b414ec59ec7dd82a': Import translations. DO NOT MERGE
| * | | | | | | | | | am 5f805a25: am d3c0ca0b: Merge "Display no-caller ID reason in InCallUI" ↵Roshan Pius2015-09-145-11/+29
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dr-dev * commit '5f805a259ca004e65c6b9091b05f5af5220ccd84': Display no-caller ID reason in InCallUI
| | * | | | | | | | | am d3c0ca0b: Merge "Display no-caller ID reason in InCallUI" into mnc-dr-devRoshan Pius2015-09-145-11/+29
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd3c0ca0b8bc6d147abc8c0ff357ab0d833f10cd5': Display no-caller ID reason in InCallUI
| * | | | | | | | | | | am 5a77e988: am 1f2b0869: Merge "Disable AccelerometerListener when display ↵Yorke Lee2015-09-094-7/+142
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is off" into mnc-dr-dev * commit '5a77e98884a1aa58ab5b7691ecf589bbbd1f2f13': Disable AccelerometerListener when display is off
| | * | | | | | | | | | am 1f2b0869: Merge "Disable AccelerometerListener when display is off" into ↵Yorke Lee2015-09-094-7/+142
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dr-dev * commit '1f2b086996855848f45408fb961acdcdf61d08cf': Disable AccelerometerListener when display is off
| * | | | | | | | | | | | am b732965f: am d67b107d: Merge "Force conference call phone numbers to ↵Andrew Lee2015-09-091-1/+5
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LTR." into mnc-dr-dev * commit 'b732965f5d7e1137902ea4b849ffd2e464f62346': Force conference call phone numbers to LTR.
| | * | | | | | | | | | | am d67b107d: Merge "Force conference call phone numbers to LTR." into mnc-dr-devAndrew Lee2015-09-091-1/+5
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd67b107d5c3215c188a10225d90ed2c6da12ea27': Force conference call phone numbers to LTR.
| * | | | | | | | | | | | | am bdb86ffb: am 46e581fa: Make sure to clear PulseAnimation correctly in ↵Yorke Lee2015-09-011-4/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | InCallActivity * commit 'bdb86ffb62b3fd8ab8f5447217f27b21c0f15468': Make sure to clear PulseAnimation correctly in InCallActivity
| | * | | | | | | | | | | | am 46e581fa: Make sure to clear PulseAnimation correctly in InCallActivityYorke Lee2015-09-011-4/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '46e581fa8b4ae7a9c58441d39c080252a1eb60af': Make sure to clear PulseAnimation correctly in InCallActivity
| * | | | | | | | | | | | | | am 645c4b60: (-s ours) am f053e4b3: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-290-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '645c4b6034303e5e602a47d24995931a70a84460': Import translations. DO NOT MERGE
| | * | | | | | | | | | | | | am f053e4b3: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-290-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f053e4b3f423caa5b3215792f5c021168c7bacb0': Import translations. DO NOT MERGE
| * | | | | | | | | | | | | | | am 6702954c: (-s ours) am 549c2a30: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6702954cf569f84b92931f1cefb4627c4d3cf5e4': Import translations. DO NOT MERGE
| | * | | | | | | | | | | | | | am 549c2a30: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-170-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '549c2a30faeab0ab25246020eeb6cd148e67bedf': Import translations. DO NOT MERGE
| * | | | | | | | | | | | | | | | am 531a41a8: am e51f0e30: Replace placeholder subject bubble asset with a ↵Tyler Gunn2015-08-133-1/+23
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | drawable resource. * commit '531a41a88509ad8f5c03a782c8d2bfecd0574e9f': Replace placeholder subject bubble asset with a drawable resource.
| | * | | | | | | | | | | | | | | am e51f0e30: Replace placeholder subject bubble asset with a drawable resource.Tyler Gunn2015-08-133-1/+23
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e51f0e30f059804176b323a987edc3d708bc7ed5': Replace placeholder subject bubble asset with a drawable resource.
| * | | | | | | | | | | | | | | | | am 53e1c9d2: am 6ccbf8fd: Merge "Minimize the number of calls to ↵Tyler Gunn2015-08-123-16/+31
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PhoneNumberUtils.isLocalEmergencyNumber." into mnc-dr-dev * commit '53e1c9d2757127aee37c472fedfc84daa12e5446': Minimize the number of calls to PhoneNumberUtils.isLocalEmergencyNumber.
| | * | | | | | | | | | | | | | | | am 6ccbf8fd: Merge "Minimize the number of calls to ↵Tyler Gunn2015-08-123-16/+31
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PhoneNumberUtils.isLocalEmergencyNumber." into mnc-dr-dev * commit '6ccbf8fdfb791d56bfd8f46d4bde2f52190eaf1f': Minimize the number of calls to PhoneNumberUtils.isLocalEmergencyNumber.
| * | | | | | | | | | | | | | | | | | am f36b5e64: (-s ours) am b54fb505: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-120-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f36b5e6419b5b9a2c2254e8de7b8155478d0bc0b': Import translations. DO NOT MERGE
| | * | | | | | | | | | | | | | | | | am b54fb505: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-120-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b54fb5052b002f1767dffb956f3e0b8299349dde': Import translations. DO NOT MERGE
| * | | | | | | | | | | | | | | | | | | am 83e68ad7: am 5fb5180e: am ba55aab3: DO NOT MERGE Null check CallList ↵Jay Shrauner2015-08-101-13/+19
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mapping in callbacks * commit '83e68ad7700ef2e68aac6ca417b3e99030781bee': DO NOT MERGE Null check CallList mapping in callbacks
| | * | | | | | | | | | | | | | | | | | am 5fb5180e: am ba55aab3: DO NOT MERGE Null check CallList mapping in callbacksJay Shrauner2015-08-101-13/+19
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5fb5180e21849fe519bd21ea44e116af89b07c4c': DO NOT MERGE Null check CallList mapping in callbacks
| * | | | | | | | | | | | | | | | | | | | am 3a08370a: (-s ours) am e638ef37: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3a08370a734d9e1bcca027051bbe113a6a361a94': Import translations. DO NOT MERGE
| | * | | | | | | | | | | | | | | | | | | am e638ef37: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-100-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e638ef37ad2b9472c0e8f7b3439ed098fb43426d': Import translations. DO NOT MERGE
| * | | | | | | | | | | | | | | | | | | | | am c3f68285: am af99da31: Merge "Show "Note sent" toast when starting ↵Tyler Gunn2015-08-074-1/+39
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | outgoing call with a note." into mnc-dr-dev * commit 'c3f68285035d9fd033afff61c1894f13178f9abc': Show "Note sent" toast when starting outgoing call with a note.
| | * | | | | | | | | | | | | | | | | | | | am af99da31: Merge "Show "Note sent" toast when starting outgoing call with ↵Tyler Gunn2015-08-074-1/+39
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a note." into mnc-dr-dev * commit 'af99da31785586e64616e0ccf418dbd41d0a84be': Show "Note sent" toast when starting outgoing call with a note.
| * | | | | | | | | | | | | | | | | | | | | | am 05ca4053: am 7d4ecade: am be729e6f: Catch RuntimeException when calling ↵Yorke Lee2015-08-061-1/+5
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setExcludeFromRecents * commit '05ca40535a0f35a1e42b2182c2bbbb73ced0adab': Catch RuntimeException when calling setExcludeFromRecents
| | * | | | | | | | | | | | | | | | | | | | | am 7d4ecade: am be729e6f: Catch RuntimeException when calling ↵Yorke Lee2015-08-061-1/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setExcludeFromRecents * commit '7d4ecade5cd3d169a2ec1229b7177f25c0141f97': Catch RuntimeException when calling setExcludeFromRecents
| * | | | | | | | | | | | | | | | | | | | | | | am 317483bd: am 916be122: Merge "Last forwarded number and incoming call ↵Tyler Gunn2015-08-0513-34/+260
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | subject." into mnc-dr-dev * commit '317483bd8871965ba6552d7bf332b72330c085ad': Last forwarded number and incoming call subject.
| | * | | | | | | | | | | | | | | | | | | | | | am 916be122: Merge "Last forwarded number and incoming call subject." into ↵Tyler Gunn2015-08-0513-34/+260
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dr-dev * commit '916be12215ce79ee1f7b82887b19e405c3a35ea7': Last forwarded number and incoming call subject.
| * | | | | | | | | | | | | | | | | | | | | | | | am 3eca1f1e: (-s ours) am 06ace6a8: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-050-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3eca1f1e4a82e9c00233df3b5adf7f443892529c': Import translations. DO NOT MERGE
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 17:29:23 +0000