OSDN Git Service
Bill Lin [Fri, 22 Feb 2019 12:49:11 +0000 (04:49 -0800)]
[automerger skipped] Merge "DO NOT MERGE Fix flaky tests in OverheatAlarm feature" into pi-dev
am:
6d19f33ca6 -s ours
am skip reason: SHA1
6d19f33ca6 skipped by user lbill
Change-Id: I806bc8dd36c81ad3ffa1cd52dc91d929fde5ab81
Bill Lin [Fri, 22 Feb 2019 12:10:00 +0000 (12:10 +0000)]
Merge "DO NOT MERGE Fix flaky tests in OverheatAlarm feature" into pi-dev-plus-aosp
Bill Lin [Fri, 22 Feb 2019 12:10:00 +0000 (12:10 +0000)]
Merge "DO NOT MERGE Fix flaky tests in OverheatAlarm feature" into pi-dev
Bill Yi [Fri, 22 Feb 2019 01:51:16 +0000 (17:51 -0800)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
ec9d9834aa -s ours
am skip reason: subject contains skip directive
Change-Id: Ib290700d68dc94c9bae11e7caed6a47fdde6a464
TreeHugger Robot [Fri, 22 Feb 2019 01:40:49 +0000 (01:40 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Thu, 21 Feb 2019 20:25:26 +0000 (12:25 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: If0bc0cddb97e786602b5be83f1a165ad6c94ef9c
Bill Yi [Thu, 21 Feb 2019 19:44:25 +0000 (11:44 -0800)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
c45da18fbb -s ours
am skip reason: subject contains skip directive
Change-Id: I9ecd8086695b52b42bf99293e4deec0ec19ff734
Daniel Sandler [Thu, 21 Feb 2019 19:41:47 +0000 (11:41 -0800)]
Merge "Skip empty slice permissions files during backup" into pi-dev
am:
6024de3b89
Change-Id: I3ae49f47a943819447abf5ad27d9b383c7dba8c3
Daniel Sandler [Thu, 21 Feb 2019 19:34:05 +0000 (11:34 -0800)]
Merge "Make notifications from the default dialer and SMS app unblockable." into pi-dev
am:
3293ab6229
Change-Id: Ic1675dfc9244f6f67ec6da0e08f3a24e837e75dc
TreeHugger Robot [Thu, 21 Feb 2019 18:42:40 +0000 (18:42 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Daniel Sandler [Thu, 21 Feb 2019 18:27:45 +0000 (18:27 +0000)]
Merge "Skip empty slice permissions files during backup" into pi-dev
Daniel Sandler [Thu, 21 Feb 2019 18:27:36 +0000 (18:27 +0000)]
Merge "Make notifications from the default dialer and SMS app unblockable." into pi-dev
Torne (Richard Coles) [Thu, 21 Feb 2019 04:50:22 +0000 (20:50 -0800)]
Merge "Clarify WebResourceResponse's stream handling." into pi-dev
am:
bec9d394d3
Change-Id: Ic15302edd0598107cf8fb7a91924ec544592b435
TreeHugger Robot [Thu, 21 Feb 2019 04:32:58 +0000 (04:32 +0000)]
Merge "Clarify WebResourceResponse's stream handling." into pi-dev
Kiyoung Kim [Thu, 21 Feb 2019 01:06:21 +0000 (17:06 -0800)]
Merge "Schematize Crypto system properties" am:
03c14760a5
am:
f7b3bdb53b
Change-Id: I47bbcec88d71840827653e9a70d91bf442ba1c22
Kiyoung Kim [Thu, 21 Feb 2019 00:38:08 +0000 (16:38 -0800)]
Merge "Schematize Crypto system properties"
am:
03c14760a5
Change-Id: Ic0bb3a6f206c68ce705c572ad5714475690a3b1c
Kiyoung Kim [Thu, 21 Feb 2019 00:16:45 +0000 (00:16 +0000)]
Merge "Schematize Crypto system properties"
Christian Wailes [Thu, 21 Feb 2019 00:12:40 +0000 (16:12 -0800)]
Merge "Updated Zygote IPC related comments." am:
f8881b6821
am:
c850654edc
Change-Id: I15a33cdf792727f58b3d89d86ccf454536737868
Christian Wailes [Wed, 20 Feb 2019 23:30:04 +0000 (15:30 -0800)]
Merge "Updated Zygote IPC related comments."
am:
f8881b6821
Change-Id: I4b69e3347f776e70711bcca2c52505de79eccef7
Leland Miller [Wed, 20 Feb 2019 23:09:43 +0000 (15:09 -0800)]
Merge "Add documentation for inserting RCS 1-on-1 thread" am:
4b93dd3ff7
am:
75488cbae5
Change-Id: I8b083f893e837b778a74941ef7b7ed2d12b2e6bc
Sasha Smundak [Wed, 20 Feb 2019 23:03:58 +0000 (15:03 -0800)]
Merge "Convert Android.mk file to Android.bp" am:
4b5b191b42
am:
1cdaea76a4
Change-Id: Ic093e88ba7b644239253952c3326c25309ecbfcd
Christian Wailes [Wed, 20 Feb 2019 22:53:45 +0000 (22:53 +0000)]
Merge "Updated Zygote IPC related comments."
Nathan Harold [Wed, 20 Feb 2019 22:51:42 +0000 (14:51 -0800)]
Merge "Debug Event for Malformed PLMN ID in CellIdentity" am:
5ea5f198c0
am:
e34afe3541
Change-Id: I8689e2e91dc3dac8499aec09b34ad67a6bde307b
Leland Miller [Wed, 20 Feb 2019 22:19:27 +0000 (14:19 -0800)]
Merge "Add documentation for inserting RCS 1-on-1 thread"
am:
4b93dd3ff7
Change-Id: I9029d2bf9d1fac8fb306ae7eda3e2defb55c3d38
Sasha Smundak [Wed, 20 Feb 2019 22:12:37 +0000 (14:12 -0800)]
Merge "Convert Android.mk file to Android.bp"
am:
4b5b191b42
Change-Id: Ibd2b03c24eee63d2f270626ebce1d4b508f0d4cf
Treehugger Robot [Wed, 20 Feb 2019 22:07:36 +0000 (22:07 +0000)]
Merge "Add documentation for inserting RCS 1-on-1 thread"
Nathan Harold [Wed, 20 Feb 2019 22:00:07 +0000 (14:00 -0800)]
Merge "Debug Event for Malformed PLMN ID in CellIdentity"
am:
5ea5f198c0
Change-Id: I369199cc54afc5e49cc267bba17437437c1261df
Treehugger Robot [Wed, 20 Feb 2019 21:08:21 +0000 (21:08 +0000)]
Merge "Convert Android.mk file to Android.bp"
Nathan Harold [Wed, 20 Feb 2019 21:08:05 +0000 (21:08 +0000)]
Merge "Debug Event for Malformed PLMN ID in CellIdentity"
Nathan Harold [Wed, 13 Feb 2019 00:13:34 +0000 (16:13 -0800)]
Debug Event for Malformed PLMN ID in CellIdentity
Add a debug event to catch the case where the modem
reports a PLMN-ID that is either malformed or incomplete.
Bug:
124332651
Test: compilation
Change-Id: Iffea47349ff999aade2aa26e30f00e5007ba7b4e
Leland Miller [Wed, 20 Feb 2019 21:05:37 +0000 (13:05 -0800)]
Merge "Split RCS events into API and internal classes" am:
609ea873b7
am:
7b46efda19
Change-Id: I2fc31c0fdc1e8eb203830dff9a7914e56ebda413
Android Build Merger (Role) [Wed, 20 Feb 2019 20:44:43 +0000 (20:44 +0000)]
Merge "Merge "Improve the performance when loading image wallpaper colors" into pi-dev am:
98684aa82a" into pi-dev-plus-aosp
Lucas Dupin [Wed, 20 Feb 2019 20:43:52 +0000 (12:43 -0800)]
Merge "Improve the performance when loading image wallpaper colors" into pi-dev
am:
98684aa82a
Change-Id: I4ff2e38dc3f40ccf6289ffbee69eed23c96fa4dc
Nathan Harold [Wed, 20 Feb 2019 20:42:50 +0000 (12:42 -0800)]
Merge "Expose the Radio HAL Version for Test Purposes" am:
a6dda25ac9
am:
225ef93d21
Change-Id: Ie4b60e4ba25b69eaef298887ca803b428620e33d
Leland Miller [Wed, 20 Feb 2019 20:41:57 +0000 (12:41 -0800)]
Merge "Split RCS events into API and internal classes"
am:
609ea873b7
Change-Id: Ic12e2ce7ba5fbc576fc2537204049a28828ec4e7
Beverly [Wed, 20 Feb 2019 20:29:58 +0000 (12:29 -0800)]
Merge "Override old alarms in zen schedule" into pi-dev
am:
2ab75b2b2e
Change-Id: I8db691e85b738d2d7821de715e124c1e3ce3b913
Lucas Dupin [Wed, 20 Feb 2019 20:26:25 +0000 (20:26 +0000)]
Merge "Improve the performance when loading image wallpaper colors" into pi-dev
Nathan Harold [Wed, 20 Feb 2019 20:21:51 +0000 (12:21 -0800)]
Merge "Expose the Radio HAL Version for Test Purposes"
am:
a6dda25ac9
Change-Id: Iaa0a92f6816779ee1e80521c4b5152c8b68a3ba4
Varun Anand [Wed, 20 Feb 2019 20:14:20 +0000 (12:14 -0800)]
[automerger skipped] Merge "Update VPN capabilities when its underlying network set is null." into pi-dev
am:
b4b64ad602 -s ours
am skip reason: change_id Id0abc4d304bb096e92479a118168690ccce634ed with SHA1
4fa80e8a2f is in history
Change-Id: I8cdd422bf5686c707d60137eccb4e1caae8194a3
TreeHugger Robot [Wed, 20 Feb 2019 20:09:39 +0000 (20:09 +0000)]
Merge "Override old alarms in zen schedule" into pi-dev
Treehugger Robot [Wed, 20 Feb 2019 20:01:14 +0000 (20:01 +0000)]
Merge "Split RCS events into API and internal classes"
TreeHugger Robot [Wed, 20 Feb 2019 19:39:41 +0000 (19:39 +0000)]
Merge "Update VPN capabilities when its underlying network set is null." into pi-dev
Chris Wailes [Wed, 20 Feb 2019 19:19:48 +0000 (11:19 -0800)]
Updated Zygote IPC related comments.
Bug:
124637285
Test: None; comment only changes
Change-Id: Ie567715a1ee08cdf65e3135aa75e3bd95ef5ab0d
Sasha Smundak [Fri, 8 Feb 2019 23:13:25 +0000 (15:13 -0800)]
Convert Android.mk file to Android.bp
See build/soong/README.md for more information.
Bug:
122332340
Test: treehugger
Change-Id: I4ccc0a2e13fc49a0109e9823fbcb4077e11455d5
Merged-In: I4ccc0a2e13fc49a0109e9823fbcb4077e11455d5
Varun Anand [Wed, 6 Feb 2019 18:13:38 +0000 (10:13 -0800)]
Update VPN capabilities when its underlying network set is null.
Previously, they were only updated when underlying network set was
non-null.
This change also ensures that all the calls b/w ConnectivityService and
Vpn that leads to updating capabilities are on ConnectivityService
handler thread.
Additionally, it also ensures that capabilities are propagated after VPN
enters connected state.
This change also updates VPN capabilities inline from
ConnectivityService handler thread. Previously, there was an additional
loop where Vpn would update capabilities via NetworkAgent thru
AsyncChannel which posts back to CS handler thread, which could
potentially lead to delays in updating VPN capabilities.
Bug:
119129310
Bug:
118856062
Bug:
124268198
Test: atest FrameworksNetTests
Test: manual - verified VPNs capabilities are getting updated and
DownloadManager is working correctly.
(cherry picked from commit
4fa80e8a2f03557221e0371a987e780df7788faa)
Change-Id: Iae5f2024b19df04c31938815b52687781d016cde
Merged-In: Id0abc4d304bb096e92479a118168690ccce634ed
Xin Li [Wed, 20 Feb 2019 18:36:50 +0000 (10:36 -0800)]
[automerger skipped] Merge changes from topic "PPRL.190205.001" am:
4ba3b12efb -s ours
am:
1e8a0c8d89 -s ours
am skip reason: change_id I421c7487955ee339f88e3957c973375d0f87e2ff with SHA1
95bd7221f6 is in history
Change-Id: If0a545f1a09f0a4471f2c6adadfe79ad434bebd4
Xin Li [Wed, 20 Feb 2019 18:17:48 +0000 (10:17 -0800)]
[automerger skipped] Merge changes from topic "PPRL.190205.001"
am:
4ba3b12efb -s ours
am skip reason: change_id I421c7487955ee339f88e3957c973375d0f87e2ff with SHA1
95bd7221f6 is in history
Change-Id: Ieb824b633f240abc96ee25f39c68f55f1bd621bd
Bill Yi [Wed, 20 Feb 2019 17:50:43 +0000 (09:50 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I0dbe18bb869d94b281c80f9514a99f5fdb35a089
Nathan Harold [Wed, 20 Feb 2019 17:50:41 +0000 (17:50 +0000)]
Merge "Expose the Radio HAL Version for Test Purposes"
Android Build Merger (Role) [Wed, 20 Feb 2019 17:44:03 +0000 (17:44 +0000)]
Merge "[automerger skipped] Fix merge problems with cherry-picking "Add notification settings to backup&restore" change into pi-dev am:
31a61f6348 -s ours am:
f43dd2bd13 -s ours am skip reason: change_id I421c7487955ee339f88e3957c973375d0f87e2ff with SHA1
95bd7221f6 is in history" into pi-dev-plus-aosp
Bill Yi [Wed, 20 Feb 2019 17:39:09 +0000 (09:39 -0800)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
31dccf9f69 -s ours
am skip reason: subject contains skip directive
Change-Id: Idcd32e03f038d9f6ae5df7b54fad8c0f7ef6b4a3
Raman Tenneti [Wed, 20 Feb 2019 17:24:20 +0000 (09:24 -0800)]
[automerger skipped] Fix merge problems with cherry-picking "Add notification settings to backup&restore" change into pi-dev am:
31a61f6348 -s ours
am:
f43dd2bd13 -s ours
am skip reason: change_id I421c7487955ee339f88e3957c973375d0f87e2ff with SHA1
95bd7221f6 is in history
Change-Id: I3659d3c7be000deb90c28967e621ca3a8989374e
TreeHugger Robot [Wed, 20 Feb 2019 17:19:48 +0000 (17:19 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Raman Tenneti [Wed, 20 Feb 2019 16:48:13 +0000 (08:48 -0800)]
[automerger skipped] Fix merge problems with cherry-picking "Add notification settings to backup&restore" change into pi-dev
am:
31a61f6348 -s ours
am skip reason: change_id I421c7487955ee339f88e3957c973375d0f87e2ff with SHA1
95bd7221f6 is in history
Change-Id: I76722b24202892034148a1c1030b8ca4d3417797
Bill Yi [Wed, 20 Feb 2019 16:35:59 +0000 (08:35 -0800)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
85288a5e3c -s ours
am skip reason: subject contains skip directive
Change-Id: Iec829f315ae6c99cf4ab5b9f1f6e68b5d8f39a3f
Bill Yi [Wed, 20 Feb 2019 16:29:00 +0000 (08:29 -0800)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
e937b2703e -s ours
am skip reason: subject contains skip directive
Change-Id: Ic06d9c19e9213965262889d5b7f56b84751e9592
Bill Yi [Wed, 20 Feb 2019 16:27:16 +0000 (08:27 -0800)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
93f661ab3b -s ours
am skip reason: subject contains skip directive
Change-Id: I7305d8553060fc8b48ff33bb717c579e353fbaea
Xin Li [Wed, 20 Feb 2019 16:25:58 +0000 (16:25 +0000)]
Merge changes from topic "PPRL.190205.001"
* changes:
Fix merge problems with cherry-picking "Add notification settings to backup&restore" change into pi-dev
DO NOT MERGE - Merge PPRL.190205.001 into master
TreeHugger Robot [Wed, 20 Feb 2019 16:25:17 +0000 (16:25 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Wed, 20 Feb 2019 16:20:24 +0000 (16:20 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Wed, 20 Feb 2019 16:14:10 +0000 (16:14 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Leland Miller [Wed, 20 Feb 2019 15:53:49 +0000 (07:53 -0800)]
Add documentation for inserting RCS 1-on-1 thread
Test: None, documentation only
Bug:
124781386
Change-Id: I1ab521aa6ceb54dc513a219b238f66a59fbfab97
Andrei-Valentin Onea [Wed, 20 Feb 2019 15:15:07 +0000 (07:15 -0800)]
Merge "Use sampled value in hidden api logger" am:
619ed85e81
am:
818e8c1bf2
Change-Id: I2cb5ac6bfae6cc98398688a4b5695260a863578a
Andrei-Valentin Onea [Wed, 20 Feb 2019 15:04:44 +0000 (07:04 -0800)]
Merge "Use sampled value in hidden api logger"
am:
619ed85e81
Change-Id: Ib6ff5b5aa75d1b35bf91748f260bab14aa6eabab
Andrei-Valentin Onea [Wed, 20 Feb 2019 14:49:10 +0000 (14:49 +0000)]
Merge "Use sampled value in hidden api logger"
Adrian Roos [Wed, 20 Feb 2019 13:18:06 +0000 (05:18 -0800)]
Merge "Fix potential memory leak in SomeArgs" am:
8a71e01423
am:
17f5ae9e26
Change-Id: I3e8c2c3f2e6cf0e119b1c6dcc1249096ea538e8c
Adrian Roos [Wed, 20 Feb 2019 13:03:59 +0000 (05:03 -0800)]
Merge "Fix potential memory leak in SomeArgs"
am:
8a71e01423
Change-Id: I007ff55f39a3239c530c30306409b498ac066801
Andrei Onea [Fri, 15 Feb 2019 13:50:47 +0000 (13:50 +0000)]
Use sampled value in hidden api logger
The hidden api logger interface also receives the actual sampled value.
This is an intermediate step before a new logging method is added.
Test: m
Bug:
119217680
(cherry picked from commit
31bde163932dab75a8301e43b2adcb684f0470ec)
Change-Id: I3345bdcdf57e1f60970c85572e503d7b33af7148
Merged-In: I707a2624a254a80391cdae277dd59daa503d055f
Adrian Roos [Wed, 20 Feb 2019 12:50:28 +0000 (12:50 +0000)]
Merge "Fix potential memory leak in SomeArgs"
Rubin Xu [Wed, 20 Feb 2019 12:26:25 +0000 (04:26 -0800)]
Merge "Skip unreachable route when estimating VPN destinations" am:
21078b1edd
am:
e000de90f4
Change-Id: Ia9301b3bf52b42a742f1f6b3a02499a1404ed3f1
Bill Yi [Wed, 20 Feb 2019 12:22:27 +0000 (04:22 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Id0e3afb74226f19cf422bdc5e33455a195676055
Rubin Xu [Wed, 20 Feb 2019 12:15:55 +0000 (04:15 -0800)]
Merge "Skip unreachable route when estimating VPN destinations"
am:
21078b1edd
Change-Id: Iafa9ecaf07a36f235b366655d2fa2165a676d1cd
Treehugger Robot [Wed, 20 Feb 2019 12:00:15 +0000 (12:00 +0000)]
Merge "Skip unreachable route when estimating VPN destinations"
Sehee Park [Wed, 20 Feb 2019 11:44:53 +0000 (03:44 -0800)]
Merge "Consider 200 response with "Content-length <= 4" to not be a captive portal." am:
1d18e60e76
am:
87bba9d278
Change-Id: Ie3e8a250b24acf668fbcdb48b6242e1ea83ebfa2
Sehee Park [Wed, 20 Feb 2019 11:35:36 +0000 (03:35 -0800)]
Merge "Consider 200 response with "Content-length <= 4" to not be a captive portal."
am:
1d18e60e76
Change-Id: I8316ad19bb5633e5c6d64d6c7e589b4bb4548617
Treehugger Robot [Wed, 20 Feb 2019 11:14:24 +0000 (11:14 +0000)]
Merge "Consider 200 response with "Content-length <= 4" to not be a captive portal."
Bin Chen [Wed, 20 Feb 2019 09:34:04 +0000 (17:34 +0800)]
Fix potential memory leak in SomeArgs
When recycling SomeArgs in pool, some fields are not set to null.
Which result potential memory leak as SomeArgs in pool still holds
the reference object.
To fix this issue, clear all args when recycling.
Change-Id: Ie730c3889da948c60ef746ddbe2e926d94ad7e06
Signed-off-by: Bin Chen <bin0515@gmail.com>
Signed-off-by: Wei Huang <hwbest.v@gmail.com>
Bill Yi [Wed, 20 Feb 2019 07:57:32 +0000 (23:57 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I1e9a93f1b40f89db42865246b67fdea660184808
Bill Yi [Wed, 20 Feb 2019 07:23:09 +0000 (23:23 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I106603e2d97492c9c95bab4e6b65ccb6d040ee9c
Xiangyu/Malcolm Chen [Wed, 20 Feb 2019 05:47:24 +0000 (21:47 -0800)]
Merge "Adding validate before switch feature." am:
f2cf09c945
am:
86ca0ba02f
Change-Id: Ib886edf8fc3d1fa1703adcc0f91e8dff606face0
Xiangyu/Malcolm Chen [Wed, 20 Feb 2019 05:38:21 +0000 (21:38 -0800)]
Merge "Adding validate before switch feature."
am:
f2cf09c945
Change-Id: Ie3f4429c1d7efefb83cf8289481a37adddd83801
Xiangyu/Malcolm Chen [Wed, 20 Feb 2019 05:25:00 +0000 (05:25 +0000)]
Merge "Adding validate before switch feature."
Tyler Gunn [Wed, 20 Feb 2019 05:07:09 +0000 (21:07 -0800)]
Merge "Add support for Telecom logging to obfuscate string phone numbers." am:
ae941732bb
am:
bfd852a7bb
Change-Id: Ib27221f30e053ea25d67cbb15625e402a58f6eda
Tyler Gunn [Wed, 20 Feb 2019 04:57:50 +0000 (20:57 -0800)]
Merge "Add support for Telecom logging to obfuscate string phone numbers."
am:
ae941732bb
Change-Id: I3ca1652cfd23ad3f94991c21e5072d4082cc20c8
Tyler Gunn [Wed, 20 Feb 2019 04:40:13 +0000 (04:40 +0000)]
Merge "Add support for Telecom logging to obfuscate string phone numbers."
Bill Yi [Wed, 20 Feb 2019 03:55:33 +0000 (19:55 -0800)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
ae15ee43e4 -s ours
am skip reason: subject contains skip directive
Change-Id: I46dd20dbc70e30354ce0773181ef7e83d926ea35
Bill Yi [Wed, 20 Feb 2019 03:46:27 +0000 (19:46 -0800)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
aebba25f55 -s ours
am skip reason: subject contains skip directive
Change-Id: Icc4b14bb5da86880a5ad5a73314209c538db126d
TreeHugger Robot [Wed, 20 Feb 2019 03:45:28 +0000 (03:45 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Wed, 20 Feb 2019 03:44:37 +0000 (19:44 -0800)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
60685350c6 -s ours
am skip reason: subject contains skip directive
Change-Id: I6971151c9547b8d8e1867a5732b2ab1c1bb7b9c3
Bill Yi [Wed, 20 Feb 2019 03:39:48 +0000 (19:39 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Idb887c01b8b6d9dd1fbb282306d2b140e65c50eb
Bill Yi [Wed, 20 Feb 2019 03:38:11 +0000 (19:38 -0800)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
e6b0455e71 -s ours
am skip reason: subject contains skip directive
Change-Id: Ic7e1612ccf2bef010ff52ce5fcfaed947f53588f
Bill Yi [Wed, 20 Feb 2019 03:36:30 +0000 (19:36 -0800)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
c691b7e52c -s ours
am skip reason: subject contains skip directive
Change-Id: I06fa6c98d7f69830fd3b1c46637990bccdb719d7
TreeHugger Robot [Wed, 20 Feb 2019 03:35:07 +0000 (03:35 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Wed, 20 Feb 2019 03:34:15 +0000 (19:34 -0800)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
6670b2287a -s ours
am skip reason: subject contains skip directive
Change-Id: I64f1059af45b3e949ceadacb5fa3a6d0673cd850
Bill Yi [Wed, 20 Feb 2019 03:32:03 +0000 (19:32 -0800)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
85c48edc69 -s ours
am skip reason: subject contains skip directive
Change-Id: I959988458fa524fb31392d79c3e8dd7ec80d3da5
Bill Yi [Wed, 20 Feb 2019 03:30:27 +0000 (19:30 -0800)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
8dfcae263a -s ours
am skip reason: subject contains skip directive
Change-Id: I416874fe5e5440dc9a1a8fc89e84ab7f34638153
TreeHugger Robot [Wed, 20 Feb 2019 03:30:10 +0000 (03:30 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Wed, 20 Feb 2019 03:27:17 +0000 (03:27 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Android Build Merger (Role) [Wed, 20 Feb 2019 03:25:43 +0000 (03:25 +0000)]
Merge "Merge "Move getPhoneCount implementation back to TelephonyManager." am:
7d6e085229 am:
2938bf23f7" into pi-dev-plus-aosp
TreeHugger Robot [Wed, 20 Feb 2019 03:25:36 +0000 (03:25 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
OSDN Git Service
