git.osdn.net Git - android-x86/frameworks-base.git/log

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

Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I7539ffdd87c19fc7dfd694dacd78f62fbec10397

commit | commitdiff | tree

TreeHugger Robot [Fri, 26 Jan 2018 20:54:50 +0000 (20:54 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

commit | commitdiff | tree

TreeHugger Robot [Fri, 26 Jan 2018 20:54:46 +0000 (20:54 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

commit | commitdiff | tree

TreeHugger Robot [Fri, 26 Jan 2018 20:54:41 +0000 (20:54 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

commit | commitdiff | tree

TreeHugger Robot [Fri, 26 Jan 2018 20:54:03 +0000 (20:54 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

commit | commitdiff | tree

TreeHugger Robot [Fri, 26 Jan 2018 20:52:07 +0000 (20:52 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

commit | commitdiff | tree

TreeHugger Robot [Fri, 26 Jan 2018 20:50:37 +0000 (20:50 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

commit | commitdiff | tree

TreeHugger Robot [Fri, 26 Jan 2018 20:50:33 +0000 (20:50 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

commit | commitdiff | tree

TreeHugger Robot [Fri, 26 Jan 2018 18:40:16 +0000 (18:40 +0000)]

Merge "Relax Instant Apps Settings whitelist enforcement" into oc-mr1-dev

commit | commitdiff | tree

TreeHugger Robot [Fri, 26 Jan 2018 18:28:20 +0000 (18:28 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I3b82c404d34ad6d9560e1c8b0e31ff9223394022

Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I2c25ff050a1cee7b26d5939f98fdb9bc4809141c

Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I61de32231eba5d425f9bd9e7f752173a32855659

Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I7ed6ce9696bdff74bd8b341d6ff7800ed7d97603

Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ic6daaa066fffa3012ec457d32827114ffdcdbf34

Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I2e6b950b2d9e70b93bf01c09cc3d1a7b325ce562

Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ic8b87dc116e142b61b415bd41682cc3a0d1535b6

Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I909efee7ae06d35c4947257213e045a97cf69e2e

Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I8df35af92728aafd2a1ee302e9f5c3a2386f5b6b

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: 41ee2787b4 -s ours

Change-Id: Ic8c5c22925b1249c6041075cd67967cbbfd3fd21

commit | commitdiff | tree

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

commit | commitdiff | tree

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

Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: 407d338837 -s ours

Change-Id: Ic2af52ea4156e11d19ae5ded4e86a7163d876903

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: 16b6bdf5a5 -s ours

Change-Id: Ibcd4c5627e0a7fb62fd32374debbfb4f52bc52d9

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: 28815c5b0e -s ours

Change-Id: I629a9d1b140dff3fa2f96d28bae37e062879e1d2

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: d6df52e22f -s ours

Change-Id: I69117be7b79ef4765d9390b34c0101141ba7831a

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 25 Jan 2018 19:09:52 +0000 (19:09 +0000)]

Merge changes from topic "am-3ca94091-64c7-4524-a9e7-1438a5fc6599" into oc-dev
am: 41ae4b7eae

Change-Id: Ic40433dd8e426ee0b13cfd04c218e84d5a089bef

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 25 Jan 2018 19:09:05 +0000 (19:09 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 9a738cccdb skipped: 10f8c984c0
am: 77243e2d28 -s ours

Change-Id: I51635f606e53d517a340e656fd28bf3be58e7acd

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 25 Jan 2018 19:05:59 +0000 (19:05 +0000)]

Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 1d77757fb5 -s ours" into nyc-mr2-dev

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 25 Jan 2018 19:05:35 +0000 (19:05 +0000)]

[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 1d77757fb5 -s ours skipped: d855899adb

Change-Id: I62b87e383181de48f322c74b9ee2a71c2d353b92

Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: 1d77757fb5 -s ours

Change-Id: I7e07b391f3af5df8b4077fe3c1c357cb14afcc18

commit | commitdiff | tree

TreeHugger Robot [Thu, 25 Jan 2018 19:04:37 +0000 (19:04 +0000)]

Merge changes from topic "am-cfa86bae-47ed-4c92-b3ac-8400ba6eb201" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 4f9f892582 skipped: 1a68c01ae5
  [automerger skipped] Import translations. DO NOT MERGE skipped: 4f9f892582
  Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Thu, 25 Jan 2018 19:04:37 +0000 (19:04 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

commit | commitdiff | tree

TreeHugger Robot [Thu, 25 Jan 2018 19:04:37 +0000 (19:04 +0000)]

Merge changes from topic "am-cfa86bae-47ed-4c92-b3ac-8400ba6eb201" into nyc-mr2-dev

* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: 4f9f892582
Import translations. DO NOT MERGE

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 25 Jan 2018 19:04:31 +0000 (19:04 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: e34cac0486 skipped: a14fb25f93
am: 19f08130b1 -s ours

Change-Id: I8a06155e0f3d7e4d50f295712ef4ab120ec6d92c

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 25 Jan 2018 18:57:49 +0000 (18:57 +0000)]

Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 0fa3646a34 -s ours" into nyc-mr2-dev

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 25 Jan 2018 18:57:23 +0000 (18:57 +0000)]

[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 0fa3646a34 -s ours skipped: d6eb3dbf4b

Change-Id: I663a8b386f4809aa08c3f26f6d28014405039490

commit | commitdiff | tree

TreeHugger Robot [Thu, 25 Jan 2018 18:57:01 +0000 (18:57 +0000)]

Merge changes from topic "am-8df06f4c-7127-41db-a6a2-64c67bb75497" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: aa7eca2f03 skipped: ccc16f92d7
  [automerger skipped] Import translations. DO NOT MERGE skipped: aa7eca2f03
  Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Thu, 25 Jan 2018 18:57:01 +0000 (18:57 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

commit | commitdiff | tree

TreeHugger Robot [Thu, 25 Jan 2018 18:57:01 +0000 (18:57 +0000)]

Merge changes from topic "am-8df06f4c-7127-41db-a6a2-64c67bb75497" into nyc-mr2-dev

* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: aa7eca2f03
Import translations. DO NOT MERGE

Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: 0fa3646a34 -s ours

Change-Id: Icdd5b7e1f54acae9914fd79949584ce80d5a489c

commit | commitdiff | tree

TreeHugger Robot [Thu, 25 Jan 2018 18:50:36 +0000 (18:50 +0000)]

Merge changes from topic "am-8df3bdfc-9f3c-40b2-b051-5cc0120da88b" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 816ddbdba7 skipped: e0e084e199
  [automerger skipped] Import translations. DO NOT MERGE skipped: 816ddbdba7
  Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Thu, 25 Jan 2018 18:50:36 +0000 (18:50 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

commit | commitdiff | tree

TreeHugger Robot [Thu, 25 Jan 2018 18:50:36 +0000 (18:50 +0000)]

Merge changes from topic "am-8df3bdfc-9f3c-40b2-b051-5cc0120da88b" into nyc-mr2-dev

* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: 816ddbdba7
Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Thu, 25 Jan 2018 18:48:29 +0000 (18:48 +0000)]

Merge changes from topic "am-37557a04-fa85-46fe-a499-4a0280811f3e" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 39a33e2ffb skipped: 2e4c69a707
  [automerger skipped] Import translations. DO NOT MERGE skipped: 39a33e2ffb
  Import translations. DO NOT MERGE