OSDN Git Service
Bill Yi [Wed, 11 Jul 2018 17:53:56 +0000 (10:53 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
b9ed290b01 -s ours
Change-Id: I2f6671ada5f0758346cd006dd9f2404b3f4a0a63
TreeHugger Robot [Wed, 11 Jul 2018 17:47:36 +0000 (17:47 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
David Brazdil [Wed, 11 Jul 2018 12:33:38 +0000 (05:33 -0700)]
resolve merge conflicts of
6e3c86c8ed7a1bcfcbc63bbded0043d4b4efbe10 to stage-aosp-master
am:
f8d22dec87
Change-Id: Ia11c6556d55a1eab3552edcd8665969001cfb9e7
Jorim Jaggi [Wed, 11 Jul 2018 12:22:34 +0000 (05:22 -0700)]
Merge "Send interaction hint when starting window animation" into pi-dev
am:
3f4232a801
Change-Id: Ie39b514828d7b751d4d9356e1cde32ad44485e68
Jorim Jaggi [Wed, 11 Jul 2018 12:10:29 +0000 (12:10 +0000)]
Merge "Send interaction hint when starting window animation" into pi-dev
David Brazdil [Wed, 11 Jul 2018 10:56:34 +0000 (11:56 +0100)]
resolve merge conflicts of
6e3c86c8ed7a1bcfcbc63bbded0043d4b4efbe10 to stage-aosp-master
BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ide3c4e229b47e4242cacafc04b70d8b392712cc8
David Brazdil [Wed, 11 Jul 2018 09:18:15 +0000 (09:18 +0000)]
Merge "Compile android.test.*.stubs into dex"
Salvador Martinez [Wed, 11 Jul 2018 01:40:02 +0000 (18:40 -0700)]
Merge "Only query for estimate on battery level change" into pi-dev
am:
729bfdf9a8
Change-Id: I7a7ec3965bc19f1f62428ea0737b6263d079dd02
Colin Cross [Wed, 11 Jul 2018 01:10:57 +0000 (18:10 -0700)]
Mark installable jars with installable: true
am:
d7647c1b66
Change-Id: If2f6daf0457bae822d88a762ef79f0162ded6ebe
TreeHugger Robot [Wed, 11 Jul 2018 00:43:02 +0000 (00:43 +0000)]
Merge "Only query for estimate on battery level change" into pi-dev
Bill Yi [Wed, 11 Jul 2018 00:34:55 +0000 (17:34 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ice16b70aac3532e8a2ba725315868dc6d60c4fde
Salvador Martinez [Wed, 4 Jul 2018 01:07:07 +0000 (18:07 -0700)]
Only query for estimate on battery level change
SysUI is querying for an estimate too much, this change gates
it on being the first estimate or the battery level having
changed so that we don't waste system resources.
Test: atest PowerUITest
Bug:
110259498
Change-Id: I6fb5c08d6388e463d6216de41b3fd49bbc489b81
Colin Cross [Tue, 10 Jul 2018 21:24:31 +0000 (14:24 -0700)]
Mark installable jars with installable: true
Most jars don't need to be installed on the device. Instead of
using java_library and java_library_static to distinguish between
them make java_library and java_library_static identical and use
installable: true to identify the few jars that need to be dexed
and installed on the device.
Bug:
110885583
Test: m checkbuild
Change-Id: I19c0e723285c7088700f50567b9c2140289f9edf
Nathan Harold [Tue, 10 Jul 2018 19:57:15 +0000 (19:57 +0000)]
Merge "Update Wcdma and Tdscdma CellInfo for HAL 1.2" into pi-dev-plus-aosp
Mathew Inwood [Tue, 10 Jul 2018 18:51:02 +0000 (11:51 -0700)]
Merge "Add build rule for API->source mapping." am:
b4919259ab
am:
4500790a81
Change-Id: Idc214d73fcf555ac15f865cc9be60909399170f8
Mathew Inwood [Tue, 10 Jul 2018 18:41:48 +0000 (11:41 -0700)]
Merge "Add build rule for API->source mapping."
am:
b4919259ab
Change-Id: I616da3024e5d310ae6993b4437611cb188c8145a
Michael Wachenschwanz [Tue, 10 Jul 2018 17:48:55 +0000 (10:48 -0700)]
[automerger skipped] Merge "Java side setup and access to Binder Proxy Tracking" am:
62d5e041a2 -s ours
am:
ccee79d9ce -s ours
Change-Id: Ic27debc1b021a77de57e384df7dba0f1d9209df8
Michael Wachenschwanz [Tue, 10 Jul 2018 17:36:25 +0000 (10:36 -0700)]
[automerger skipped] Merge "Java side setup and access to Binder Proxy Tracking"
am:
62d5e041a2 -s ours
Change-Id: Ic9cbde38cded481a75ce772f91c741f39de0360f
Mathew Inwood [Tue, 10 Jul 2018 17:12:37 +0000 (17:12 +0000)]
Merge "Add build rule for API->source mapping."
Colin Cross [Tue, 10 Jul 2018 16:29:55 +0000 (09:29 -0700)]
Merge "Mark installable jars with installable: true" am:
1035f48f61
am:
19609a7993
Change-Id: I4a345d295633892dc97789e9db21f381420e1b5c
Treehugger Robot [Tue, 10 Jul 2018 16:24:47 +0000 (16:24 +0000)]
Merge "Java side setup and access to Binder Proxy Tracking"
Colin Cross [Tue, 10 Jul 2018 16:12:46 +0000 (09:12 -0700)]
Merge "Mark installable jars with installable: true"
am:
1035f48f61
Change-Id: Ia3176e68ddd7cfdb8351b2a0ea95efc9dd94d922
Colin Cross [Tue, 10 Jul 2018 14:51:50 +0000 (14:51 +0000)]
Merge "Mark installable jars with installable: true"
David Brazdil [Thu, 28 Jun 2018 09:23:50 +0000 (10:23 +0100)]
Compile android.test.*.stubs into dex
Adjust the build rules of android.test.*.stubs packages to also
produce a jar with dex files. This will be used by the `hiddenapi`
tool to categorize the boot class path equivalents as public API.
Bug:
79409988
Test: m android.test.base.stubs ; check javalib.jar contains dex
Merged-In: I1d0850b18044c559ea4b9893d929dc45884b32c3
Change-Id: Ief28cd5e6d0cdd58f22fab751e0173ccf8c69a0c
Julia Reynolds [Tue, 10 Jul 2018 13:03:42 +0000 (06:03 -0700)]
Merge "Be more strict about triggering notification lights" into pi-dev
am:
f00bfbe46e
Change-Id: I6c999a970a309f7888d6157c7a17f5d0ca05e32c
Julia Reynolds [Tue, 10 Jul 2018 12:49:16 +0000 (12:49 +0000)]
Merge "Be more strict about triggering notification lights" into pi-dev
Olivier Gaillard [Tue, 10 Jul 2018 08:59:32 +0000 (01:59 -0700)]
Merge "Add a getTransactionName method to Binder." am:
079f03f584
am:
06aa142232
Change-Id: I4695382d0c3e6489428a3178326630c655c3f0d5
Olivier Gaillard [Tue, 10 Jul 2018 08:50:30 +0000 (01:50 -0700)]
Merge "Add a getTransactionName method to Binder."
am:
079f03f584
Change-Id: Ie157d490cf074d5b015406cb9739366cc4d46b87
Mathew Inwood [Fri, 22 Jun 2018 14:30:02 +0000 (15:30 +0100)]
Add build rule for API->source mapping.
This is used to get source positions of all class members in the boot
class path, to automate the addition of annotations. See
go/hidden-api-annotations for more context.
Mappings printed in:
out/soong/.intermediates/frameworks/base/hiddenapi-mappings
/android_common/dex-mapping.txt
Test: make hiddenapi-mappings
Bug:
110868826
Change-Id: Ie67a8be6a5a71447a25d081bd466b8b5e01b0725
Olivier Gaillard [Tue, 10 Jul 2018 07:23:14 +0000 (07:23 +0000)]
Merge "Add a getTransactionName method to Binder."
Erik Kline [Tue, 10 Jul 2018 01:10:41 +0000 (18:10 -0700)]
[automerger skipped] Merge "Always close file descriptors" into pi-dev
am:
8fe381f0fd -s ours
Change-Id: I831da822dea43107aafd6a5ad54a4a7832d0699a
Jason Monk [Tue, 10 Jul 2018 01:03:47 +0000 (18:03 -0700)]
Merge "Fix leak where system held onto slice providers" into pi-dev
am:
a2b1e5f013
Change-Id: I09ba87cf5c1f1a0099119a015fdd113a3da2375c
Chavi Weingarten [Tue, 10 Jul 2018 00:55:40 +0000 (17:55 -0700)]
Merge "WM: Add debug information for forced seamless rotation" into pi-dev
am:
4db8f31c43
Change-Id: I70af626a302fde9b3bd7bd4733799cac67e5dcbe
Hall Liu [Tue, 10 Jul 2018 00:44:16 +0000 (17:44 -0700)]
Merge "Fix readImmediately for CTS" into pi-dev
am:
ec328eea49
Change-Id: Ife6c64a03a3ac46430198db05ec6c9ac87524900
TreeHugger Robot [Tue, 10 Jul 2018 00:28:57 +0000 (00:28 +0000)]
Merge "Always close file descriptors" into pi-dev
TreeHugger Robot [Mon, 9 Jul 2018 23:49:42 +0000 (23:49 +0000)]
Merge "Fix leak where system held onto slice providers" into pi-dev
Chavi Weingarten [Mon, 9 Jul 2018 23:45:34 +0000 (23:45 +0000)]
Merge "WM: Add debug information for forced seamless rotation" into pi-dev
TreeHugger Robot [Mon, 9 Jul 2018 22:47:29 +0000 (22:47 +0000)]
Merge "Fix readImmediately for CTS" into pi-dev
Haibo Huang [Mon, 9 Jul 2018 22:44:54 +0000 (15:44 -0700)]
Merge "Remove CSV support" am:
0faecf7b89
am:
9fada2364f
Change-Id: Ibf1fe01c8e69407decf760307ad3747f1c3cb317
Jorim Jaggi [Mon, 9 Jul 2018 22:36:57 +0000 (00:36 +0200)]
Send interaction hint when starting window animation
If we are starting a window animation, there is a very strong
correlation that usually just before the user took some kind of
action.
However, in some cases the power hint may be lost of there are not
continiously produced frames between the user interaction and the
window animation, like when opening the IME but it takes a while
until the IME comes up, or when the status bar automatically hides
after being temporarily shown in a fullscreen app.
Test: SurfaceAnimationRunnerTest
Test: Go to an immersive_sticky app, swipe down from top, wait
until status bar hides, make sure interaction hint gets sent.
Bug:
111253599
Change-Id: Id517d48a63d4c528265a808c49043d936d804625
Haibo Huang [Mon, 9 Jul 2018 21:41:03 +0000 (14:41 -0700)]
Merge "Remove CSV support"
am:
0faecf7b89
Change-Id: I02e8b74299afda2642567e3fcf9a41653cb7b888
Adrian Roos [Fri, 6 Jul 2018 09:39:54 +0000 (02:39 -0700)]
WM: Add debug information for forced seamless rotation
Bug:
111062294
Test: adb shell dumpsys window ScreenDecoration
Change-Id: I2521cfde6cdc04644666eff753226d6d008d378f
Merged-In: I2521cfde6cdc04644666eff753226d6d008d378f
Olivier Gaillard [Thu, 5 Jul 2018 14:07:35 +0000 (15:07 +0100)]
Add a getTransactionName method to Binder.
This method transforms a binder call code to a human readable name.
AIDL generator will have the ability to override this method.
Test: n/a
Bug:
111200705
Change-Id: Ic1d82e9b403ab40c8b625ca977a819ccd521dd97
Haibo Huang [Mon, 9 Jul 2018 20:32:31 +0000 (20:32 +0000)]
Merge "Remove CSV support"
Jorim Jaggi [Mon, 9 Jul 2018 17:55:53 +0000 (10:55 -0700)]
Fix janky wakeup animation
am:
c4cf07a16f
Change-Id: I198ed0d6d5385ba54f548def2680a02a400ee0c2
Julia Reynolds [Tue, 3 Jul 2018 14:43:35 +0000 (10:43 -0400)]
Be more strict about triggering notification lights
Don't trigger lights if they should be suppressed by notification flags.
Don't log that notification lights happened if global or temporary
settings have turned them off
Test: runtest systemui-notification, verify
notification_itnerruptiveness numbers for a fresh 3p app that uses
lights
Bug:
111069748
Change-Id: I68750bf39eb76ef0bda40ddacfd90e1be79e8575
(cherry picked from commit
28149f65f9f036f746957d1323efda20aed94ba3)
Jorim Jaggi [Thu, 5 Jul 2018 16:28:12 +0000 (18:28 +0200)]
Fix janky wakeup animation
Previous wake-up animation was totally broken before, as multiple
animations were running with different interpolators and different
durations, creating a really jaring experience for the front-door
of the phone, which users see hundreds of times a day.
Instead, we use a single animator to drive everything, and pass in
both the interpolated and the linear value so the right value can
be used in whichever place.
Test: Wakeup/sleep phone with different numbers of notifications
Fixes:
110980608
Change-Id: If1758404a4c49fcd7dc9fa3c93bb18e42a586632
Haibo Huang [Fri, 6 Jul 2018 23:55:27 +0000 (16:55 -0700)]
Remove CSV support
CSV is deprecated upstream. See:
https://github.com/google/benchmark/commit/
7b8d0249d8d66040ce9ffe6b94cc8421ef3e61d8
Test: m checkbuild
Change-Id: I4b85535d4296c6f0d1f0eec95b40c065b3143134
Nathan Harold [Wed, 28 Mar 2018 15:39:43 +0000 (08:39 -0700)]
Update Wcdma and Tdscdma CellInfo for HAL 1.2
In HAL 1.2 WCDMA and TDSCMA were updated to bring
them in line with the other CellInfo types. WCDMA
was missing support for Rscp and Ec/No; the former
being the primary measurement used for WCDMA signal
strength. TDSCDMA was missing support for RSSI, and
the definition for RSCP was incorrect, so it was fixed
to use the PCCPH RSCP.
Furthermore, TDSCDMA support was unavailable except
in the CellIdentity. This patch pipes support from the
HAL to the framework, adding CellInfoTdscdma, which is
primarily for Asia.
-Add RSCP and Ec/No fields to CellSignalStrengthWcdma
-Add CellInfoTdscdma and CellSignalStrengthTdscdma
-Add UARFCN and Alphas support for CellIdentityTdscdma
-Fix a bug in the equals() check for CellIdentity
-Update documentation for CellInfo<RAT> classes and
the getLevel() methods of CellSignalStrength<RAT>
Bug:
76153768
Test: RILTests added for TDSCDMA
Change-Id: I71e0998f1a9bd7656d495003a8ee5ef616ca4f43
Lucas Dupin [Fri, 6 Jul 2018 22:23:30 +0000 (15:23 -0700)]
Merge "Hide windows even when AOD is off" into pi-dev
am:
5c75b5b60e
Change-Id: If72e024f9d3d31ef774588b5cac5f1b553608717
TreeHugger Robot [Fri, 6 Jul 2018 22:10:50 +0000 (22:10 +0000)]
Merge "Hide windows even when AOD is off" into pi-dev
Jordan Liu [Fri, 6 Jul 2018 19:15:49 +0000 (12:15 -0700)]
Merge "Type Allocation Code & Manufacturer Code" am:
ff801e5fd7
am:
50f29d8ecf
Change-Id: Ia5ee66c5f99ddd0700bc971ba895c73594e9a517
Jordan Liu [Fri, 6 Jul 2018 19:06:39 +0000 (12:06 -0700)]
Merge "Type Allocation Code & Manufacturer Code"
am:
ff801e5fd7
Change-Id: I95b5fd3d2fb977db3f37dcf23c2125c521c1ccd1
Jordan Liu [Fri, 6 Jul 2018 17:51:42 +0000 (17:51 +0000)]
Merge "Type Allocation Code & Manufacturer Code"
Neil Fuller [Fri, 6 Jul 2018 16:59:52 +0000 (09:59 -0700)]
resolve merge conflicts of
7980b19bc8fa1fb0c4b4b3abea891d6e245b3edd to stage-aosp-master
am:
3147288c3b
Change-Id: Ie04ef5cd3277271304c3564ee6e41d8c24dee74c
Neil Fuller [Fri, 6 Jul 2018 15:32:44 +0000 (16:32 +0100)]
resolve merge conflicts of
7980b19bc8fa1fb0c4b4b3abea891d6e245b3edd to stage-aosp-master
BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ica0d3578c6e3fcd17b350f63b4acd471774ac014
Treehugger Robot [Fri, 6 Jul 2018 13:58:29 +0000 (13:58 +0000)]
Merge "Track changes in libcore to remove a constructor"
Bill Yi [Fri, 6 Jul 2018 08:25:24 +0000 (01:25 -0700)]
Merge changes from topic "am-
59bde7f2-9903-448c-9ad1-
8364ed396cf3" into oc-dev am:
cec93100ea am:
7557661787 am:
199b3ee0d8
am:
6dc57344d6
Change-Id: I9444a409941d6a8c99fea77647c882c234130e81
Bill Yi [Fri, 6 Jul 2018 08:15:58 +0000 (01:15 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
c28b092c5e skipped:
33cf864720 am:
c6d9bee144 -s ours am:
bf6bbefe57 -s ours am:
c1a9ad2a19 -s ours
am:
648f0b4c44 -s ours
Change-Id: I215661853a8dbeba6c09f509e549cd1e89b01357
Bill Yi [Fri, 6 Jul 2018 07:57:55 +0000 (00:57 -0700)]
Merge changes from topic "am-
8b8b3d01-a327-4923-ae09-
35940a00b1b3" into oc-dev am:
72e16b1754 am:
af687adf49 am:
f9a749eb82
am:
b5334fff17
Change-Id: I2e7f90604338e5d7d8139244167c540a617d8507
Bill Yi [Fri, 6 Jul 2018 07:48:40 +0000 (00:48 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
e35f1fdbae skipped:
39c48a1168 am:
a05627322f -s ours am:
a8276b8de4 -s ours am:
1080ba61c3 -s ours
am:
0ae92cd7fa -s ours
Change-Id: Id975cb72fd89e421060606ae98a5f652bbb2b384
Bill Yi [Fri, 6 Jul 2018 07:42:28 +0000 (00:42 -0700)]
Merge changes from topic "am-
5c22e81a-5f3d-46c4-9d8f-
58c6edfac103" into oc-dev am:
6005492cb2 am:
851e826783 am:
e2a7c24f03
am:
d91868aee5
Change-Id: Id7a9ce4822a524a29a0aafbdb99304c258414439
Bill Yi [Fri, 6 Jul 2018 07:33:24 +0000 (00:33 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
ff2f705557 skipped:
4740838b56 am:
8700285134 -s ours am:
f2ea6f55d9 -s ours am:
9bf5cb9b7f -s ours
am:
8dfe2e787c -s ours
Change-Id: I0ec5b6c4975d95cb806d98e99d950de77a953f8e
Bill Yi [Fri, 6 Jul 2018 07:27:06 +0000 (00:27 -0700)]
Merge changes from topic "am-
dd912fb1-a10b-413b-b531-
a015abbbf9e3" into oc-dev am:
37d9749e81 am:
b434b0c169 am:
086abb7a59
am:
cd74671aa7
Change-Id: I319b9c8b5898be896d4c2b1a0f25542d6fde1145
Bill Yi [Fri, 6 Jul 2018 07:18:14 +0000 (00:18 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f02d29629d skipped:
ace44c1ee6 am:
eacf5ffefb -s ours am:
67f18d810a -s ours am:
d635022d93 -s ours
am:
84729fca53 -s ours
Change-Id: I42ba97e9889d62b3a82252b534a3bdae1d81452c
Bill Yi [Fri, 6 Jul 2018 06:40:19 +0000 (23:40 -0700)]
Merge changes from topic "am-
59bde7f2-9903-448c-9ad1-
8364ed396cf3" into oc-dev am:
cec93100ea am:
7557661787
am:
199b3ee0d8
Change-Id: I7330886e1c2ddcbb92c1a3fa03e9a4a8276d31a2
Bill Yi [Fri, 6 Jul 2018 06:32:52 +0000 (23:32 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
c28b092c5e skipped:
33cf864720 am:
c6d9bee144 -s ours am:
bf6bbefe57 -s ours
am:
c1a9ad2a19 -s ours
Change-Id: Ib512c45c735b6259220d2e0934fa6132f533d421
Bill Yi [Fri, 6 Jul 2018 06:25:25 +0000 (23:25 -0700)]
Merge changes from topic "am-
8b8b3d01-a327-4923-ae09-
35940a00b1b3" into oc-dev am:
72e16b1754 am:
af687adf49
am:
f9a749eb82
Change-Id: I4d285431b8384196b449c43360a118eddf98f15d
Bill Yi [Fri, 6 Jul 2018 06:17:39 +0000 (23:17 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
e35f1fdbae skipped:
39c48a1168 am:
a05627322f -s ours am:
a8276b8de4 -s ours
am:
1080ba61c3 -s ours
Change-Id: I3284bfe82cef35b5e4b30c686f2fb5c381e858a8
Bill Yi [Fri, 6 Jul 2018 06:12:01 +0000 (23:12 -0700)]
Merge changes from topic "am-
5c22e81a-5f3d-46c4-9d8f-
58c6edfac103" into oc-dev am:
6005492cb2 am:
851e826783
am:
e2a7c24f03
Change-Id: Ie4e2d6c9fe04adc0d26dc2d7a4d9e7c8ef89fb74
Bill Yi [Fri, 6 Jul 2018 06:04:17 +0000 (23:04 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
ff2f705557 skipped:
4740838b56 am:
8700285134 -s ours am:
f2ea6f55d9 -s ours
am:
9bf5cb9b7f -s ours
Change-Id: I92f228dd4920d493591d44e4ab6e7e6b731d9e8a
Bill Yi [Fri, 6 Jul 2018 05:38:26 +0000 (22:38 -0700)]
Merge changes from topic "am-
dd912fb1-a10b-413b-b531-
a015abbbf9e3" into oc-dev am:
37d9749e81 am:
b434b0c169
am:
086abb7a59
Change-Id: I50abf9cc8aeb4c0086c9f2b4d3f7620853d7d0cc
Bill Yi [Fri, 6 Jul 2018 05:36:46 +0000 (22:36 -0700)]
Merge changes from topic "am-
59bde7f2-9903-448c-9ad1-
8364ed396cf3" into oc-dev am:
cec93100ea
am:
7557661787
Change-Id: I543dafa974e9f5c677957fd19d6f03fcf796213a
Bill Yi [Fri, 6 Jul 2018 05:30:53 +0000 (22:30 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f02d29629d skipped:
ace44c1ee6 am:
eacf5ffefb -s ours am:
67f18d810a -s ours
am:
d635022d93 -s ours
Change-Id: I21b5b66696cb1f6c6683e46c82ee71a7d8751c24
Bill Yi [Fri, 6 Jul 2018 05:30:27 +0000 (22:30 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
c28b092c5e skipped:
33cf864720 am:
c6d9bee144 -s ours
am:
bf6bbefe57 -s ours
Change-Id: Ife52c79c0b85d9f09f1d2cf7b792239aaae24868
Bill Yi [Fri, 6 Jul 2018 05:25:31 +0000 (22:25 -0700)]
Merge changes from topic "am-
8b8b3d01-a327-4923-ae09-
35940a00b1b3" into oc-dev am:
72e16b1754
am:
af687adf49
Change-Id: I3885703da8f3f7bfe6b72c25d1f3ed19d6aeac9a
Bill Yi [Fri, 6 Jul 2018 05:23:02 +0000 (22:23 -0700)]
Merge changes from topic "am-
20b78215-c47d-481a-9e96-
79127da1c87c" into oc-dev am:
c1dc805861 am:
812ec62a14 am:
c3ff91a225
am:
12835665f3
Change-Id: Ie2ae1dfe4d816b85fa47d77188cdc654eaa9b3dd
Bill Yi [Fri, 6 Jul 2018 05:18:16 +0000 (22:18 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
e35f1fdbae skipped:
39c48a1168 am:
a05627322f -s ours
am:
a8276b8de4 -s ours
Change-Id: I13817952fd66ca2501a35a0e1223bc7d932a2ddc
Bill Yi [Fri, 6 Jul 2018 05:12:53 +0000 (22:12 -0700)]
Merge changes from topic "am-
5c22e81a-5f3d-46c4-9d8f-
58c6edfac103" into oc-dev am:
6005492cb2
am:
851e826783
Change-Id: I1b866e81f48a4d642657cd963fd8e04faa3c1537
Bill Yi [Fri, 6 Jul 2018 05:12:52 +0000 (22:12 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
32c08741ec skipped:
8062f299b1 am:
998f40e6c5 -s ours am:
fcca5bb731 -s ours am:
d18e450922 -s ours
am:
8944491476 -s ours
Change-Id: I9a04d7182cab26789a590f9a37b9c636a2a1406c
Bill Yi [Fri, 6 Jul 2018 05:05:37 +0000 (22:05 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
ff2f705557 skipped:
4740838b56 am:
8700285134 -s ours
am:
f2ea6f55d9 -s ours
Change-Id: Ic88b3b3dcc9ed3148c6e3d150705e7f40b36c8d0
Bill Yi [Fri, 6 Jul 2018 05:02:12 +0000 (22:02 -0700)]
Merge changes from topic "am-
20b78215-c47d-481a-9e96-
79127da1c87c" into oc-dev am:
c1dc805861 am:
812ec62a14
am:
c3ff91a225
Change-Id: I69dc7a8329df67e668addcd07d288709230cf48e
Bill Yi [Fri, 6 Jul 2018 05:00:12 +0000 (22:00 -0700)]
Merge changes from topic "am-
dd912fb1-a10b-413b-b531-
a015abbbf9e3" into oc-dev am:
37d9749e81
am:
b434b0c169
Change-Id: I817b45781ecea994292c346d9e3bd4584e0f2d1f
Bill Yi [Fri, 6 Jul 2018 04:53:48 +0000 (21:53 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
32c08741ec skipped:
8062f299b1 am:
998f40e6c5 -s ours am:
fcca5bb731 -s ours
am:
d18e450922 -s ours
Change-Id: Icb43cc60577ca81ada301f283b9e3e1bf4cf6ccc
Bill Yi [Fri, 6 Jul 2018 04:53:26 +0000 (21:53 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f02d29629d skipped:
ace44c1ee6 am:
eacf5ffefb -s ours
am:
67f18d810a -s ours
Change-Id: Ifaeaf651a92fd5bd261180f0aaa68bb2da521fc0
Bill Yi [Fri, 6 Jul 2018 04:48:16 +0000 (21:48 -0700)]
Merge changes from topic "am-
20b78215-c47d-481a-9e96-
79127da1c87c" into oc-dev am:
c1dc805861
am:
812ec62a14
Change-Id: I66ce801571d91b5e3791a57cebfe9b56715515b7
Bill Yi [Fri, 6 Jul 2018 04:41:17 +0000 (21:41 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
32c08741ec skipped:
8062f299b1 am:
998f40e6c5 -s ours
am:
fcca5bb731 -s ours
Change-Id: Ib39dfb279c982016f6102a4ee6d26e6e5f925d91
Bill Yi [Fri, 6 Jul 2018 04:21:38 +0000 (21:21 -0700)]
Merge changes from topic "am-
5f59ad6e-1c79-44f8-a437-
eac2cc321cdf" into oc-dev am:
ec4d649d8f am:
f051b28554 am:
5d61a6618b
am:
402176177c
Change-Id: I1a6a0df3694acd7bc47cde041b94f7a1902a25f3
Bill Yi [Fri, 6 Jul 2018 04:18:08 +0000 (21:18 -0700)]
Merge changes from topic "am-
59bde7f2-9903-448c-9ad1-
8364ed396cf3" into oc-dev
am:
cec93100ea
Change-Id: If8c2cd293875724b99a5177c7235ffbeb64c396e
Bill Yi [Fri, 6 Jul 2018 04:15:54 +0000 (21:15 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
c28b092c5e skipped:
33cf864720
am:
c6d9bee144 -s ours
Change-Id: If1145747718e78a0ad5f60015aa0398e1813c078
Bill Yi [Fri, 6 Jul 2018 04:11:50 +0000 (21:11 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
cd4aea64f6 skipped:
f028c34cdc am:
9204ce40e4 -s ours am:
e45b804b65 -s ours am:
d9d9d1daca -s ours
am:
9f950537e4 -s ours
Change-Id: I14c71ce82a5d857ef9bdabb7015c582db1dcb3f0
Bill Yi [Fri, 6 Jul 2018 04:11:19 +0000 (21:11 -0700)]
Merge changes from topic "am-
8b8b3d01-a327-4923-ae09-
35940a00b1b3" into oc-dev
am:
72e16b1754
Change-Id: I75a0f507a546413eeee64870ba94be647ee5de11
Bill Yi [Fri, 6 Jul 2018 04:08:51 +0000 (21:08 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
e35f1fdbae skipped:
39c48a1168
am:
a05627322f -s ours
Change-Id: I8b0805714082f83552ebb6cbd8290bcd0c39d6cd
Bill Yi [Fri, 6 Jul 2018 03:58:16 +0000 (20:58 -0700)]
Merge changes from topic "am-
5c22e81a-5f3d-46c4-9d8f-
58c6edfac103" into oc-dev
am:
6005492cb2
Change-Id: I71789a270fc86b5fc9c74c0de2cd122f1ac26c5e
Bill Yi [Fri, 6 Jul 2018 03:57:24 +0000 (20:57 -0700)]
Merge changes from topic "am-
5f59ad6e-1c79-44f8-a437-
eac2cc321cdf" into oc-dev am:
ec4d649d8f am:
f051b28554
am:
5d61a6618b
Change-Id: I0eeeb695d9125b05d136700b3e03157c25a302fc
Bill Yi [Fri, 6 Jul 2018 03:56:04 +0000 (20:56 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
ff2f705557 skipped:
4740838b56
am:
8700285134 -s ours
Change-Id: Ice563d38360e1be62c5f6b869dc69f1ce5dfff24
Bill Yi [Fri, 6 Jul 2018 03:51:41 +0000 (20:51 -0700)]
Merge changes from topic "am-
dd912fb1-a10b-413b-b531-
a015abbbf9e3" into oc-dev
am:
37d9749e81
Change-Id: I6258da69f13a1ea21b50d0756315619ef190a526
Bill Yi [Fri, 6 Jul 2018 03:49:13 +0000 (20:49 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f02d29629d skipped:
ace44c1ee6
am:
eacf5ffefb -s ours
Change-Id: I034e3f1a5916c01dc643cde92bd6f42187b5c480
Bill Yi [Fri, 6 Jul 2018 03:48:58 +0000 (20:48 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
cd4aea64f6 skipped:
f028c34cdc am:
9204ce40e4 -s ours am:
e45b804b65 -s ours
am:
d9d9d1daca -s ours
Change-Id: Id13c67950da4a13f9035c0e35b903237948f61a5
Bill Yi [Fri, 6 Jul 2018 03:44:43 +0000 (20:44 -0700)]
Merge changes from topic "am-
20b78215-c47d-481a-9e96-
79127da1c87c" into oc-dev
am:
c1dc805861
Change-Id: I3a40076fd344300ac6dd812ea2c96012f88e36b0