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

Android Build Merger (Role) [Thu, 25 Jan 2018 23:33:35 +0000 (23:33 +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
am: fd1f0742b7 -s ours

Change-Id: I37e9454080f4ed4766ccfd69594106ee48a64638

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 25 Jan 2018 23:32:22 +0000 (23:32 +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
am: 81666bea7f -s ours

Change-Id: I0a46b477cb406d54a404faa37c121fc8f7de0e1d

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 25 Jan 2018 23:31:12 +0000 (23:31 +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
am: 3a09b4e748 -s ours

Change-Id: I709ad494550215037ca532d902c2935c7f22efb1

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 25 Jan 2018 23:29:49 +0000 (23:29 +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
am: 106209572e -s ours

Change-Id: Ic6e35cc2b54e9d7b9e8642839780e174b233de2d

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 25 Jan 2018 23:24:52 +0000 (23:24 +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
am: 8b1d663a52

Change-Id: I4c09d6a137a6fbaa0c945556d8ae9496f8bd7b81

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 25 Jan 2018 23:19:27 +0000 (23:19 +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
am: 4f65db7421 -s ours

Change-Id: Ia39df9681739abb613a586c02b72c103868befa0

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 25 Jan 2018 23:17:31 +0000 (23:17 +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
am: 1e9b3172bc -s ours

Change-Id: Idd53800a33435dcff27f6bc904349560dea039cd

commit | commitdiff | tree

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

Merge changes from topic "am-cfa86bae-47ed-4c92-b3ac-8400ba6eb201" into oc-dev am: 11c37d01f7 am: e72f06b29b
am: b7cd649409

Change-Id: Ia143af5bd7d0428697039726dfe661e40d5b4fab

commit | commitdiff | tree

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

[automerger skipped] Import translations. DO NOT MERGE skipped: 4f9f892582 skipped: 1a68c01ae5 am: 6f59280206 -s ours am: f19c7ab533 -s ours
am: 1860adf0cd -s ours

Change-Id: I834f8a47ed9a76b0efb9b98fdeb3ea779444c1c3

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 25 Jan 2018 23:10:18 +0000 (23:10 +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
am: 22c5a224c7 -s ours

Change-Id: I55e03b6e57defd4f9ae37fb732e929612e26fce5

commit | commitdiff | tree

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

Merge changes from topic "am-8df06f4c-7127-41db-a6a2-64c67bb75497" into oc-dev am: 6367f8199d am: f1d0f9652c
am: 33e2d30f87

Change-Id: I9feb53a57b4d76de983f589d24d4ef03fcd7f2b0

commit | commitdiff | tree

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

[automerger skipped] Import translations. DO NOT MERGE skipped: aa7eca2f03 skipped: ccc16f92d7 am: 387047a201 -s ours am: f12ba9fee4 -s ours
am: 3c2c04a47d -s ours

Change-Id: I040121c18d1cc3d6915068e885a62b65d997a530

commit | commitdiff | tree

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

Merge changes from topic "am-8df3bdfc-9f3c-40b2-b051-5cc0120da88b" into oc-dev am: eb9a92f942 am: 939313310b
am: 6a423ee7ce

Change-Id: Ifeab0174b98a7755f246966e6e689d46cdbacdbc

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:57:14 +0000 (22:57 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 816ddbdba7 skipped: e0e084e199 am: a9d64326ad -s ours am: 8a35a13afe -s ours
am: 73f06fe35f -s ours

Change-Id: Ie7b7de25c5f5340f37a20d02db6b5a1bb37e781f

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: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:48 +0000 (22:35 +0000)]

Merge changes from topic "am-d53588def0a94e089fd73c9ebe97efe7" into oc-mr1-dev-plus-aosp

* changes:
Merge changes from topic "am-37557a04-fa85-46fe-a499-4a0280811f3e" into oc-dev am: bcf3392856 am: 0fe900767e am: 5e991b9ef8
[automerger skipped] Import translations. DO NOT MERGE skipped: 39a33e2ffb skipped: 2e4c69a707 am: d7b199be9a -s ours am: 4dfc160224 -s ours am: 4685af2a89 -s ours

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:35:15 +0000 (22:35 +0000)]

Merge changes from topic "am-37557a04-fa85-46fe-a499-4a0280811f3e" into oc-dev am: bcf3392856 am: 0fe900767e
am: 5e991b9ef8

Change-Id: Ia332ea53b0f50bba13caa4e1e86f1d13e67e8121

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

David Brazdil [Thu, 25 Jan 2018 22:32:28 +0000 (22:32 +0000)]

Merge "Show a warning toast/dialog when an app uses hidden APIs" am: fbef950d95
am: d750a7c68c

Change-Id: I9b62537d76e4ceb7ce03ca4de5ccf5a182c4439c

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:30:49 +0000 (22:30 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 39a33e2ffb skipped: 2e4c69a707 am: d7b199be9a -s ours am: 4dfc160224 -s ours
am: 4685af2a89 -s ours

Change-Id: I1d757f2124f18a50281f96bb8b579f895dc1f3fb

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:24:12 +0000 (22:24 +0000)]

Merge changes from topic "am-56dd07c8eceb476bbfad59becddc1ba1" into oc-mr1-dev-plus-aosp

* changes:
Merge changes from topic "am-6a9a8997-43fc-40a2-827f-5f1c575c8748" into oc-dev am: f310c792d4 am: 94b7fafc69 am: e977655e31
[automerger skipped] Import translations. DO NOT MERGE skipped: 2c3e611a18 skipped: 218841a6dd am: 8eb39fb0f4 -s ours am: a8e2306430 -s ours am: 6ccac2ffc3 -s ours

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:23:29 +0000 (22:23 +0000)]

Merge changes from topic "am-6a9a8997-43fc-40a2-827f-5f1c575c8748" into oc-dev am: f310c792d4 am: 94b7fafc69
am: e977655e31

Change-Id: I7e50ca49c650aca991556f6d99c926633183bd89

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:20:40 +0000 (22:20 +0000)]

Merge "Merge "Tcp socket metrics: implement INetdEventListener callback" am: 93b1787a3d am: 5ba62a2194" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Hugo Benichi [Thu, 25 Jan 2018 22:19:53 +0000 (22:19 +0000)]

Merge "Tcp socket metrics: implement INetdEventListener callback" am: 93b1787a3d
am: 5ba62a2194

Change-Id: I6c30a47ed35394d63b266250e3525976844b0e8f

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 25 Jan 2018 22:17:14 +0000 (22:17 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 2c3e611a18 skipped: 218841a6dd am: 8eb39fb0f4 -s ours am: a8e2306430 -s ours
am: 6ccac2ffc3 -s ours

Change-Id: Idf30f2ec1c917c94cdc27959df184713db36bef9

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:13:13 +0000 (22:13 +0000)]

Merge "Merge "ActivityManager: Add support for agents on startup" am: d5cba89b98 am: ebc0afd811" into oc-mr1-dev-plus-aosp

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

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

Merge changes from topic "am-8d673f3fe8844346b58e11d8ef00c99a" into oc-mr1-dev-plus-aosp

* changes:
Merge changes from topic "am-459a2298-9d91-42be-bcee-e19446619a42" into oc-dev am: 806b4573aa am: 981bc5a1ac am: 38508aeaf5
[automerger skipped] Import translations. DO NOT MERGE skipped: 4cd0777c01 skipped: 03130e4fbb am: 0a09cd4b21 -s ours am: cd4371f3cc -s ours am: ea52aec628 -s ours

commit | commitdiff | tree

Andreas Gampe [Thu, 25 Jan 2018 22:10:27 +0000 (22:10 +0000)]

Merge "ActivityManager: Add support for agents on startup" am: d5cba89b98
am: ebc0afd811

Change-Id: Ie8b991014a43ca4fba83aeab3ba826996d2813df

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 25 Jan 2018 22:08:51 +0000 (22:08 +0000)]

Merge changes from topic "am-459a2298-9d91-42be-bcee-e19446619a42" into oc-dev am: 806b4573aa am: 981bc5a1ac
am: 38508aeaf5

Change-Id: Icf34d805cfd9274e1d00dd35b4db8afa1356742b

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

Holly Jiuyu Sun [Thu, 25 Jan 2018 22:06:08 +0000 (22:06 +0000)]

Merge "Fill in methods in EuiccCardController." am: 197f072da2
am: d143bb628a

Change-Id: I327158452fb1fc341de7a31c9004aa757406d9bd

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:02:48 +0000 (22:02 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 4cd0777c01 skipped: 03130e4fbb am: 0a09cd4b21 -s ours am: cd4371f3cc -s ours
am: ea52aec628 -s ours

Change-Id: I3afa944070a378a25dd38551cfd02e397ec7f298

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

David Brazdil [Thu, 25 Jan 2018 22:01:49 +0000 (22:01 +0000)]

Merge "Show a warning toast/dialog when an app uses hidden APIs"
am: fbef950d95

Change-Id: Icab7166bf83d2920c8d3f22774eafa4aea9fdaa4

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:08 +0000 (21:56 +0000)]

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

Change-Id: I0310d50282b343261575d20cda3536667c8478b9

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

Hugo Benichi [Thu, 25 Jan 2018 21:55:08 +0000 (21:55 +0000)]

Merge "Tcp socket metrics: implement INetdEventListener callback"
am: 93b1787a3d

Change-Id: Ife421f2612b0bfc2d6be5c6d174d24abd4d2e2fb

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:53 +0000 (21:50 +0000)]

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

Change-Id: I39d1e16f34fea09009c039a955040e811988d422

commit | commitdiff | tree

Andreas Gampe [Thu, 25 Jan 2018 21:50:42 +0000 (21:50 +0000)]

Merge "ActivityManager: Add support for agents on startup"
am: d5cba89b98

Change-Id: Iee82ac1a08183857ea4fcf2d67b99dede5d5a2ae

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

Holly Jiuyu Sun [Thu, 25 Jan 2018 21:47:46 +0000 (21:47 +0000)]

Merge "Fill in methods in EuiccCardController."
am: 197f072da2

Change-Id: I9d8db8ef23c7a469b38748ba8fd4b3a91ca4506e

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

commit | commitdiff | tree

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

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

David Brazdil [Thu, 25 Jan 2018 19:53:13 +0000 (19:53 +0000)]

Merge "Show a warning toast/dialog when an app uses hidden APIs"

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:56 +0000 (19:23 +0000)]

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

Change-Id: Ia2241da1274d0436eb8eafc70addd55f8d99c45b

commit | commitdiff | tree

Treehugger Robot [Thu, 25 Jan 2018 19:23:18 +0000 (19:23 +0000)]

Merge "Tcp socket metrics: implement INetdEventListener callback"

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

commit | commitdiff | tree

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

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

commit | commitdiff | tree

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

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

commit | commitdiff | tree

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

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

commit | commitdiff | tree

Bill Yi [Thu, 25 Jan 2018 19:04:46 +0000 (19:04 +0000)]

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 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