OSDN Git Service
Android Build Merger (Role) [Thu, 1 Feb 2018 03:24:13 +0000 (03:24 +0000)]
Merge changes from topic "am-
1ab9514f-fd12-4093-b1cb-
a77e9f0419c9" into oc-dev am:
46fc48f57e
am:
b39e49d52c
Change-Id: Iaf02c5ebdb656fc79cde201e6df97760283ea4e4
Android Build Merger (Role) [Thu, 1 Feb 2018 03:13:16 +0000 (03:13 +0000)]
Merge changes from topic "am-
1ab9514f-fd12-4093-b1cb-
a77e9f0419c9" into oc-dev
am:
46fc48f57e
Change-Id: I85ba0993926fbd9a61525e35e411887130b3c5aa
TreeHugger Robot [Wed, 31 Jan 2018 22:13:40 +0000 (22:13 +0000)]
Merge changes from topic "am-
1ab9514f-fd12-4093-b1cb-
a77e9f0419c9" into oc-dev
* changes:
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682 am:
0ab4540c41 am:
a3f0976937 am:
166aa6e149 am:
b7f7f7e14e am:
c26b8635b7 am:
afac0f46d9 am:
5786491706
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682 am:
0ab4540c41 am:
a3f0976937 am:
166aa6e149 am:
b7f7f7e14e am:
c26b8635b7 am:
afac0f46d9
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682 am:
0ab4540c41 am:
a3f0976937 am:
166aa6e149 am:
b7f7f7e14e am:
c26b8635b7
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682 am:
0ab4540c41 am:
a3f0976937 am:
166aa6e149 am:
b7f7f7e14e
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682 am:
0ab4540c41 am:
a3f0976937 am:
166aa6e149
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682 am:
0ab4540c41 am:
a3f0976937
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682 am:
0ab4540c41
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909
Check for null-terminator in ResStringPool::string8At
Shuzhen Wang [Wed, 31 Jan 2018 21:49:57 +0000 (21:49 +0000)]
Merge "OutputConfiguration: Fix missing mIsShared in parcel read" into oc-dev am:
5f7cdba8ab
am:
df255a4a6b
Change-Id: I273a04bfcab3b26da4bc745445d144db1a0c9419
Shuzhen Wang [Wed, 31 Jan 2018 21:28:00 +0000 (21:28 +0000)]
Merge "OutputConfiguration: Fix missing mIsShared in parcel read" into oc-dev
am:
5f7cdba8ab
Change-Id: Ic55969e029228542f79e870cb7b5c68602b9a084
TreeHugger Robot [Wed, 31 Jan 2018 21:11:32 +0000 (21:11 +0000)]
Merge "OutputConfiguration: Fix missing mIsShared in parcel read" into oc-dev
Jakub Pawlowski [Fri, 8 Dec 2017 06:56:03 +0000 (22:56 -0800)]
Fix bad type for txPower in PeriodicAdvertisingReport serialization
Bug:
69634768
Test: compilation
Change-Id: Icedfbaf1ba933637e935ada0fd98aea42c73f2b2
Merged-In: Icedfbaf1ba933637e935ada0fd98aea42c73f2b2
Svetoslav Ganov [Wed, 31 Jan 2018 01:55:49 +0000 (01:55 +0000)]
Merge "Use correct user id for permission check for instant foreground service" into oc-mr1-dev
Jon Dormody [Mon, 29 Jan 2018 21:04:50 +0000 (21:04 +0000)]
Merge "Docs: Changed "the value of an item that previously added with putExtra()" to "the value of an item previously added with putExtra(),"" into oc-mr1-dev
Jon Dormody [Mon, 29 Jan 2018 19:23:32 +0000 (19:23 +0000)]
Merge "Docs: Inserting a line to include the documentation for keyPreviewHeight." into oc-mr1-dev
Jon Dormody [Mon, 29 Jan 2018 19:23:15 +0000 (19:23 +0000)]
Merge "Docs: Added a link to the Motion Sensor docs for information on gravity values and calculating alpha. Test: make ds-docs Bug:
6442659" into oc-mr1-dev
Ricardo Loo Foronda [Thu, 25 Jan 2018 16:42:43 +0000 (08:42 -0800)]
Docs: Removed rogue "(TODO)" note in FLAG_SHOW_LIGHTS member
Status: Ready for review
Note: This is a Javadoc only change.
Changes: Removed unnecessary "(TODO)" note.
Test: Build the docs with "make ds-docs" and staged updated content.
Staged content:
go/dac-stage/reference/android/app/Notification.html#FLAG_SHOW_LIGHTS
Bug:
20150478
Change-Id: I3a7fc0414ccb6f52e9b4919031a93ca1a7a29336
Ricardo Loo Foronda [Mon, 29 Jan 2018 04:04:09 +0000 (04:04 +0000)]
Merge "Docs: Fixed broken link to Traceview docs" into oc-mr1-dev
Ricardo Loo Foronda [Mon, 29 Jan 2018 02:27:48 +0000 (02:27 +0000)]
Merge "docs: Added a missing "be" in ACTION_CONNECTION_STATE_CHANGED" into oc-mr1-dev
TreeHugger Robot [Sun, 28 Jan 2018 06:49:19 +0000 (06:49 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sat, 27 Jan 2018 17:32:17 +0000 (17:32 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Sat, 27 Jan 2018 01:50:20 +0000 (17:50 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I7539ffdd87c19fc7dfd694dacd78f62fbec10397
Jonathan Dormody [Thu, 11 Jan 2018 20:18:59 +0000 (13:18 -0700)]
Docs: Added a link to the Motion Sensor docs for information on gravity
values and calculating alpha.
Test: make ds-docs
Bug:
6442659
Change-Id: Ifbb58526d01894c4c7570596348a8bd3e5c9eb4f
Jonathan Dormody [Wed, 15 Nov 2017 21:10:57 +0000 (14:10 -0700)]
Docs: Changed "the value of an item that previously added with
putExtra()" to "the value of an item previously added with putExtra(),"
Test: make ds-docs
Bug:
1429953
Change-Id: Ided080aea7686e7a711376fa380c41027b71b1d3
TreeHugger Robot [Fri, 26 Jan 2018 20:54:50 +0000 (20:54 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Fri, 26 Jan 2018 20:54:46 +0000 (20:54 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Fri, 26 Jan 2018 20:54:41 +0000 (20:54 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Fri, 26 Jan 2018 20:54:03 +0000 (20:54 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Fri, 26 Jan 2018 20:52:07 +0000 (20:52 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Fri, 26 Jan 2018 20:50:37 +0000 (20:50 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Fri, 26 Jan 2018 20:50:33 +0000 (20:50 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Svet Ganov [Thu, 7 Dec 2017 07:45:38 +0000 (23:45 -0800)]
Use correct user id for permission check for instant foreground service
Test: cts-tradefed run cts-dev -m CtsAppSecurityHostTestCases
-t android.appsecurity.cts.EphemeralTest#testStartForegrondService
bug:
68275646
Bug:
71366502
Change-Id: I196522c49ae8a7e0ec07bf631f04bae51e96db5b
cherry pick from: https://android-review.googlesource.com/c/platform/frameworks/base/+/559340
(cherry picked from commit
e32c238ce76151dd6221e6762f841c8f721c45f7)
Change-Id: Idfeae038d42b9dee9f6f57203f2bdb0764f51877
TreeHugger Robot [Fri, 26 Jan 2018 18:40:16 +0000 (18:40 +0000)]
Merge "Relax Instant Apps Settings whitelist enforcement" into oc-mr1-dev
TreeHugger Robot [Fri, 26 Jan 2018 18:28:20 +0000 (18:28 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Ricardo Loo Foronda [Thu, 25 Jan 2018 17:10:47 +0000 (09:10 -0800)]
Docs: Fixed broken link to Traceview docs
Status: Ready for review.
Note: This is a Javadoc only change.
Changes:
* Replaced "guide/developing/tools/traceview.html/ with
"studio/profile/traceview.html"
Test: * Build with "make ds-docs -j16"
* Staged content at go/dac-stage/reference/android/os/Debug.html
* Ran linkchecker against staged content
Bug:
37640935
Change-Id: I0446c44a78ae7d1d9193e2fe08e059cdc90cac7a
Ricardo Loo Foronda [Thu, 25 Jan 2018 01:49:18 +0000 (17:49 -0800)]
docs: Added a missing "be" in ACTION_CONNECTION_STATE_CHANGED
Status: Ready for writer review.
Note: This is a javadoc only change.
Test: Build the docs with "make ds-docs" and staged updated content.
Staged content:
go/dac-stage/reference/android/bluetooth/BluetoothAdapter.html#ACTION_CONNECTION_STATE_CHANGED
Bug:
69097875
Change-Id: Ibffea2373ded825558beaa669ae4daf3c0ff3d2f
Bill Yi [Fri, 26 Jan 2018 17:04:23 +0000 (09:04 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I3b82c404d34ad6d9560e1c8b0e31ff9223394022
Bill Yi [Fri, 26 Jan 2018 15:25:46 +0000 (07:25 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I2c25ff050a1cee7b26d5939f98fdb9bc4809141c
Bill Yi [Fri, 26 Jan 2018 12:15:30 +0000 (04:15 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I61de32231eba5d425f9bd9e7f752173a32855659
Bill Yi [Fri, 26 Jan 2018 12:00:28 +0000 (04:00 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I7ed6ce9696bdff74bd8b341d6ff7800ed7d97603
Bill Yi [Fri, 26 Jan 2018 11:46:02 +0000 (03:46 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ic6daaa066fffa3012ec457d32827114ffdcdbf34
Bill Yi [Fri, 26 Jan 2018 11:31:30 +0000 (03:31 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I2e6b950b2d9e70b93bf01c09cc3d1a7b325ce562
Bill Yi [Fri, 26 Jan 2018 10:35:09 +0000 (02:35 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ic8b87dc116e142b61b415bd41682cc3a0d1535b6
Bill Yi [Fri, 26 Jan 2018 10:04:47 +0000 (02:04 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I909efee7ae06d35c4947257213e045a97cf69e2e
Bill Yi [Fri, 26 Jan 2018 01:41:18 +0000 (17:41 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I8df35af92728aafd2a1ee302e9f5c3a2386f5b6b
Android Build Merger (Role) [Thu, 25 Jan 2018 23:02:34 +0000 (23:02 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
41ee2787b4 -s ours skipped:
705235ca51 am:
e15cb623db -s ours
am:
8289005e10 -s ours
Change-Id: Idf2c76f87a2ad90f286ae0882c8d718b2b4f5264
Android Build Merger (Role) [Thu, 25 Jan 2018 23:00:57 +0000 (23:00 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
407d338837 -s ours skipped:
6ad3912399 am:
7e0d93a69b -s ours
am:
dba446b7a3 -s ours
Change-Id: I6fdd508d07c0d808e6d9a217b880da21ecf92178
Android Build Merger (Role) [Thu, 25 Jan 2018 22:59:26 +0000 (22:59 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
16b6bdf5a5 -s ours skipped:
03ed0985ef am:
0e2501decd -s ours
am:
f03288d9f2 -s ours
Change-Id: I8cdc2239faba5031d836b9e29673e8b93da57e77
Android Build Merger (Role) [Thu, 25 Jan 2018 22:57:45 +0000 (22:57 +0000)]
Merge "Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
1d77757fb5 -s ours" into nyc-mr2-dev am:
a22445abae -s ours" into oc-dev am:
dbdfba9546 -s ours
am:
dbbffc9bd6 -s ours
Change-Id: I0aadadd28c2fdb9a0190f3b65929c2b8b467079a
Android Build Merger (Role) [Thu, 25 Jan 2018 22:54:55 +0000 (22:54 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
28815c5b0e -s ours skipped:
0534420c5d am:
6866408a78 -s ours
am:
abad95933a -s ours
Change-Id: Idf38d6f4b8aa647338e2524e40f3319755b3f680
Android Build Merger (Role) [Thu, 25 Jan 2018 22:53:14 +0000 (22:53 +0000)]
Merge "Merge changes from topic "am-
cfa86bae-47ed-4c92-b3ac-
8400ba6eb201" into nyc-mr2-dev am:
2d947206f7" into oc-dev am:
066be5e6e1
am:
6981d14838
Change-Id: Icca4a7d217d1bc80c6e109b51b2e54d43ad78684
Android Build Merger (Role) [Thu, 25 Jan 2018 22:47:33 +0000 (22:47 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
d6df52e22f -s ours skipped:
7f649e7e6d am:
5cd687505a -s ours
am:
77803cc4fa -s ours
Change-Id: If1e29e82960702d59818a245d5a4d0e3fc0cef10
Android Build Merger (Role) [Thu, 25 Jan 2018 22:45:48 +0000 (22:45 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
1d77757fb5 -s ours skipped:
d855899adb am:
350fc5d06a -s ours
am:
02ee278871 -s ours
Change-Id: Ice440c8517e49f87b42dadfe2a728e65c9a3bcaf
Android Build Merger (Role) [Thu, 25 Jan 2018 22:43:37 +0000 (22:43 +0000)]
Merge changes from topic "am-
cfa86bae-47ed-4c92-b3ac-
8400ba6eb201" into oc-dev am:
11c37d01f7
am:
e72f06b29b
Change-Id: I06f2d1af886d01b0cbf3429b5d9e361e4b03fe68
Android Build Merger (Role) [Thu, 25 Jan 2018 22:40:03 +0000 (22:40 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
4f9f892582 skipped:
1a68c01ae5 am:
6f59280206 -s ours
am:
f19c7ab533 -s ours
Change-Id: I25a06490c9bed46c67d6b8ab7a541015e45086c3
Android Build Merger (Role) [Thu, 25 Jan 2018 22:38:06 +0000 (22:38 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
0fa3646a34 -s ours skipped:
d6eb3dbf4b am:
7b9a09d8d2 -s ours
am:
bf2ee3c9dd -s ours
Change-Id: If22ddf2b413bf74534addcabcb3477097411d542
Android Build Merger (Role) [Thu, 25 Jan 2018 22:37:51 +0000 (22:37 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
41ee2787b4 -s ours skipped:
705235ca51
am:
e15cb623db -s ours
Change-Id: If1d3c8b5d25c1faeac56120ebdf23f83863dd60c
Android Build Merger (Role) [Thu, 25 Jan 2018 22:36:14 +0000 (22:36 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
407d338837 -s ours skipped:
6ad3912399
am:
7e0d93a69b -s ours
Change-Id: Ie4e14d3d017c630cf1ac8ed5f462537f2271259b
Android Build Merger (Role) [Thu, 25 Jan 2018 22:35:27 +0000 (22:35 +0000)]
Merge changes from topic "am-
8df06f4c-7127-41db-a6a2-
64c67bb75497" into oc-dev am:
6367f8199d
am:
f1d0f9652c
Change-Id: I423e13a45ec384e625db0b8015c394f88b888ac1
Android Build Merger (Role) [Thu, 25 Jan 2018 22:34:43 +0000 (22:34 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
16b6bdf5a5 -s ours skipped:
03ed0985ef
am:
0e2501decd -s ours
Change-Id: I16708e07aa533aaf608e28ebd19e8a0ad9049e04
Android Build Merger (Role) [Thu, 25 Jan 2018 22:31:56 +0000 (22:31 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
aa7eca2f03 skipped:
ccc16f92d7 am:
387047a201 -s ours
am:
f12ba9fee4 -s ours
Change-Id: I5356cae2b66a847ac9622d4c866c592f8f663ba0
Android Build Merger (Role) [Thu, 25 Jan 2018 22:28:28 +0000 (22:28 +0000)]
Merge "Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
1d77757fb5 -s ours" into nyc-mr2-dev am:
a22445abae -s ours" into oc-dev
am:
dbdfba9546 -s ours
Change-Id: Ia18ac187b0f64f03f0327b651b7befd7dd41d3c9
Android Build Merger (Role) [Thu, 25 Jan 2018 22:27:07 +0000 (22:27 +0000)]
Merge changes from topic "am-
8df3bdfc-9f3c-40b2-b051-
5cc0120da88b" into oc-dev am:
eb9a92f942
am:
939313310b
Change-Id: I7f444ed85aad3b0eedcab0d537d3e18340d5a506
Android Build Merger (Role) [Thu, 25 Jan 2018 22:26:21 +0000 (22:26 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
28815c5b0e -s ours skipped:
0534420c5d
am:
6866408a78 -s ours
Change-Id: I33a4d20f2fad121680ee0e7d6f68135f41d23ae1
Android Build Merger (Role) [Thu, 25 Jan 2018 22:23:29 +0000 (22:23 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
816ddbdba7 skipped:
e0e084e199 am:
a9d64326ad -s ours
am:
8a35a13afe -s ours
Change-Id: I1df7859e4421fdada6d170ad3a5780ebd359403f
Android Build Merger (Role) [Thu, 25 Jan 2018 22:22:47 +0000 (22:22 +0000)]
Merge "Merge changes from topic "am-
cfa86bae-47ed-4c92-b3ac-
8400ba6eb201" into nyc-mr2-dev am:
2d947206f7" into oc-dev
am:
066be5e6e1
Change-Id: Icd0d4d7eccd19fe58e7523f1be1bf4958e207997
Android Build Merger (Role) [Thu, 25 Jan 2018 22:14:08 +0000 (22:14 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
d6df52e22f -s ours skipped:
7f649e7e6d
am:
5cd687505a -s ours
Change-Id: I08621df252756495257329a271cc6daed40605c5
Android Build Merger (Role) [Thu, 25 Jan 2018 22:12:12 +0000 (22:12 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
1d77757fb5 -s ours skipped:
d855899adb
am:
350fc5d06a -s ours
Change-Id: Ibc93567a28a3709b6f97a5cd03cde04a94bac751
Android Build Merger (Role) [Thu, 25 Jan 2018 22:11:40 +0000 (22:11 +0000)]
Merge changes from topic "am-
37557a04-fa85-46fe-a499-
4a0280811f3e" into oc-dev am:
bcf3392856
am:
0fe900767e
Change-Id: I3b62983c0c6eb2bbfbf74739e8d5703ddcd56303
Chad Brubaker [Sun, 24 Dec 2017 04:06:44 +0000 (20:06 -0800)]
Relax Instant Apps Settings whitelist enforcement
The strict whitelist of settings for Instant Apps is leading to too much
unintended breakage, remove the enforcement until better infrastructure
can be added to make sure settings that should be whitelisted are.
Bug:
71009655
Test: Coming in a follow up
(cherry picked from commit
b6108d621002d4de708ae526e7c2bc95dabef080)
Change-Id: Iaa1d71331407cee86c10105c1e5668ffd0c925a1
Android Build Merger (Role) [Thu, 25 Jan 2018 22:08:45 +0000 (22:08 +0000)]
Merge changes from topic "am-
cfa86bae-47ed-4c92-b3ac-
8400ba6eb201" into oc-dev
am:
11c37d01f7
Change-Id: I82f397e11e5d0beae8ec218db6e5e4a511feb720
Android Build Merger (Role) [Thu, 25 Jan 2018 22:08:03 +0000 (22:08 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
39a33e2ffb skipped:
2e4c69a707 am:
d7b199be9a -s ours
am:
4dfc160224 -s ours
Change-Id: I9f96ce4c677fafd32b612735089d3ae97d8fa16b
Android Build Merger (Role) [Thu, 25 Jan 2018 22:07:40 +0000 (22:07 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
4f9f892582 skipped:
1a68c01ae5
am:
6f59280206 -s ours
Change-Id: Ibd4542deee4166251cc2f97eb0b42e6181681050
Android Build Merger (Role) [Thu, 25 Jan 2018 22:04:58 +0000 (22:04 +0000)]
Merge changes from topic "am-
6a9a8997-43fc-40a2-827f-
5f1c575c8748" into oc-dev am:
f310c792d4
am:
94b7fafc69
Change-Id: Id25852c4f17eb92cf9bda17a5670bcb104ca0f78
Android Build Merger (Role) [Thu, 25 Jan 2018 22:04:22 +0000 (22:04 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
0fa3646a34 -s ours skipped:
d6eb3dbf4b
am:
7b9a09d8d2 -s ours
Change-Id: I55b4283893453ef46897b4bf8aaee7a389c7ae12
Android Build Merger (Role) [Thu, 25 Jan 2018 22:01:55 +0000 (22:01 +0000)]
Merge changes from topic "am-
8df06f4c-7127-41db-a6a2-
64c67bb75497" into oc-dev
am:
6367f8199d
Change-Id: I377fb4d83376cd24c1e4edcab6c2f240cffefd79
Android Build Merger (Role) [Thu, 25 Jan 2018 22:01:14 +0000 (22:01 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
2c3e611a18 skipped:
218841a6dd am:
8eb39fb0f4 -s ours
am:
a8e2306430 -s ours
Change-Id: I900c69922ed9ca74c8d23dc5ac34678177f0d373
Android Build Merger (Role) [Thu, 25 Jan 2018 22:01:07 +0000 (22:01 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
aa7eca2f03 skipped:
ccc16f92d7
am:
387047a201 -s ours
Change-Id: Ib85a1fe883e15d23907bbc51724847617240158d
Android Build Merger (Role) [Thu, 25 Jan 2018 21:56:56 +0000 (21:56 +0000)]
Merge changes from topic "am-
8df3bdfc-9f3c-40b2-b051-
5cc0120da88b" into oc-dev
am:
eb9a92f942
Change-Id: Iecc7a0821c6469d00849c0d25138ebb593e6a438
Android Build Merger (Role) [Thu, 25 Jan 2018 21:56:07 +0000 (21:56 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
816ddbdba7 skipped:
e0e084e199
am:
a9d64326ad -s ours
Change-Id: I786402375e6a75936d097c82a0221a3c8db94268
Android Build Merger (Role) [Thu, 25 Jan 2018 21:53:50 +0000 (21:53 +0000)]
Merge changes from topic "am-
459a2298-9d91-42be-bcee-
e19446619a42" into oc-dev am:
806b4573aa
am:
981bc5a1ac
Change-Id: I2a52f4b62e872e32d07e0e994c90282fa20bc946
Android Build Merger (Role) [Thu, 25 Jan 2018 21:53:24 +0000 (21:53 +0000)]
Merge changes from topic "am-
37557a04-fa85-46fe-a499-
4a0280811f3e" into oc-dev
am:
bcf3392856
Change-Id: Ic06a49e43f4f5e1ebc4aef0f66f0ecc1296eb843
Android Build Merger (Role) [Thu, 25 Jan 2018 21:52:14 +0000 (21:52 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
39a33e2ffb skipped:
2e4c69a707
am:
d7b199be9a -s ours
Change-Id: I7aa21a0d4310323f666a5326a019555d15e006ff
Android Build Merger (Role) [Thu, 25 Jan 2018 21:50:18 +0000 (21:50 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
4cd0777c01 skipped:
03130e4fbb am:
0a09cd4b21 -s ours
am:
cd4371f3cc -s ours
Change-Id: Ie76e94193cbb2c18fbe4d481b8b4bd0b44648488
Android Build Merger (Role) [Thu, 25 Jan 2018 21:49:42 +0000 (21:49 +0000)]
Merge changes from topic "am-
6a9a8997-43fc-40a2-827f-
5f1c575c8748" into oc-dev
am:
f310c792d4
Change-Id: Ifc8e1838bea63b3401dbd41e2d1dd04ca67b1eb2
Android Build Merger (Role) [Thu, 25 Jan 2018 21:48:48 +0000 (21:48 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
2c3e611a18 skipped:
218841a6dd
am:
8eb39fb0f4 -s ours
Change-Id: Iadcf60e51485dc0952c6f7800a996e91585854a5
Android Build Merger (Role) [Thu, 25 Jan 2018 21:48:45 +0000 (21:48 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
41ee2787b4 -s ours skipped:
705235ca51
Change-Id: I57003c4084de0c55b990bdba5e498fb07c0ad937
Bill Yi [Thu, 25 Jan 2018 21:48:06 +0000 (21:48 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
41ee2787b4 -s ours
Change-Id: Ic8c5c22925b1249c6041075cd67967cbbfd3fd21
Android Build Merger (Role) [Thu, 25 Jan 2018 21:46:35 +0000 (21:46 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
407d338837 -s ours skipped:
6ad3912399
Change-Id: Ia0b55c69a3f7f6b576f9fd2faa02866681961587
Android Build Merger (Role) [Thu, 25 Jan 2018 21:46:22 +0000 (21:46 +0000)]
Merge changes from topic "am-
459a2298-9d91-42be-bcee-
e19446619a42" into oc-dev
am:
806b4573aa
Change-Id: I1cfe38aa5a80dd142ef80375957766ce6b8daf99
Bill Yi [Thu, 25 Jan 2018 21:45:40 +0000 (21:45 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
407d338837 -s ours
Change-Id: Ic2af52ea4156e11d19ae5ded4e86a7163d876903
Android Build Merger (Role) [Thu, 25 Jan 2018 21:45:31 +0000 (21:45 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
4cd0777c01 skipped:
03130e4fbb
am:
0a09cd4b21 -s ours
Change-Id: I939c7d74e9c575b6ed205dc5713579bb03cb31d5
Android Build Merger (Role) [Thu, 25 Jan 2018 19:25:06 +0000 (19:25 +0000)]
Merge changes from topic "am-
3ca94091-64c7-4524-a9e7-
1438a5fc6599" into oc-dev am:
41ae4b7eae
am:
6c1ecb973c
Change-Id: Ie305f8b8f404f9dcf19f53d51fca7eafed03faaa
Android Build Merger (Role) [Thu, 25 Jan 2018 19:23:08 +0000 (19:23 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
16b6bdf5a5 -s ours skipped:
03ed0985ef
Change-Id: I113bf00458f99e58ed965245aff19a7f461ac143
Bill Yi [Thu, 25 Jan 2018 19:22:07 +0000 (19:22 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
16b6bdf5a5 -s ours
Change-Id: Ibcd4c5627e0a7fb62fd32374debbfb4f52bc52d9
Android Build Merger (Role) [Thu, 25 Jan 2018 19:21:27 +0000 (19:21 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
9a738cccdb skipped:
10f8c984c0 am:
77243e2d28 -s ours
am:
114cd10ac9 -s ours
Change-Id: Ia0342f04f3fca736521746aa7008bd40d84f0d1f
Android Build Merger (Role) [Thu, 25 Jan 2018 19:18:06 +0000 (19:18 +0000)]
Merge "Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
1d77757fb5 -s ours" into nyc-mr2-dev am:
a22445abae -s ours" into oc-dev
Android Build Merger (Role) [Thu, 25 Jan 2018 19:17:00 +0000 (19:17 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
1d77757fb5 -s ours" into nyc-mr2-dev
am:
a22445abae -s ours
Change-Id: If06e22ea49de21de8d0243174481425bf6eebe00
Android Build Merger (Role) [Thu, 25 Jan 2018 19:16:41 +0000 (19:16 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
28815c5b0e -s ours skipped:
0534420c5d
Change-Id: Ib28f32367d753392da264d786ead51b438ea92ef
Bill Yi [Thu, 25 Jan 2018 19:15:45 +0000 (19:15 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
28815c5b0e -s ours
Change-Id: I629a9d1b140dff3fa2f96d28bae37e062879e1d2
Android Build Merger (Role) [Thu, 25 Jan 2018 19:14:57 +0000 (19:14 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
e34cac0486 skipped:
a14fb25f93 am:
19f08130b1 -s ours
am:
fa70de88c5 -s ours
Change-Id: Iab847c723ba9b240967d759276c06c9643955ea6
Android Build Merger (Role) [Thu, 25 Jan 2018 19:14:36 +0000 (19:14 +0000)]
Merge "Merge changes from topic "am-
cfa86bae-47ed-4c92-b3ac-
8400ba6eb201" into nyc-mr2-dev am:
2d947206f7" into oc-dev
Android Build Merger (Role) [Thu, 25 Jan 2018 19:13:58 +0000 (19:13 +0000)]
Merge changes from topic "am-
cfa86bae-47ed-4c92-b3ac-
8400ba6eb201" into nyc-mr2-dev
am:
2d947206f7
Change-Id: I2c2aae1e6ec927843fa15241c4dbbffed1039cb7
Android Build Merger (Role) [Thu, 25 Jan 2018 19:13:04 +0000 (19:13 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
d6df52e22f -s ours skipped:
7f649e7e6d
Change-Id: I6fbe4b2b677e6a16f1c98491b3dcf7b748fc6fd5
Bill Yi [Thu, 25 Jan 2018 19:12:11 +0000 (19:12 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
d6df52e22f -s ours
Change-Id: I69117be7b79ef4765d9390b34c0101141ba7831a
OSDN Git Service
