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

(root) / android-x86 / frameworks-base.git / log

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

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

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

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

commit | commitdiff | tree

Bill Yi [Thu, 25 Jan 2018 18:56:32 +0000 (18:56 +0000)]

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

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 nyc-mr2-dev

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

commit | commitdiff | tree

TreeHugger Robot [Thu, 25 Jan 2018 18:46:43 +0000 (18:46 +0000)]

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

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 2c3e611a18 skipped: 218841a6dd
  [automerger skipped] Import translations. DO NOT MERGE skipped: 2c3e611a18
  Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Thu, 25 Jan 2018 18:46:43 +0000 (18:46 +0000)]

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

commit | commitdiff | tree

TreeHugger Robot [Thu, 25 Jan 2018 18:46:43 +0000 (18:46 +0000)]

Merge changes from topic "am-6a9a8997-43fc-40a2-827f-5f1c575c8748" into nyc-mr2-dev

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

commit | commitdiff | tree

TreeHugger Robot [Thu, 25 Jan 2018 18:44:49 +0000 (18:44 +0000)]

Merge changes from topic "am-459a2298-9d91-42be-bcee-e19446619a42" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 4cd0777c01 skipped: 03130e4fbb
  [automerger skipped] Import translations. DO NOT MERGE skipped: 4cd0777c01
  Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Thu, 25 Jan 2018 18:44:49 +0000 (18:44 +0000)]

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

commit | commitdiff | tree

TreeHugger Robot [Thu, 25 Jan 2018 18:44:49 +0000 (18:44 +0000)]

Merge changes from topic "am-459a2298-9d91-42be-bcee-e19446619a42" into nyc-mr2-dev

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

commit | commitdiff | tree

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

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

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 9a738cccdb skipped: 10f8c984c0
  [automerger skipped] Import translations. DO NOT MERGE skipped: 9a738cccdb
  Import translations. DO NOT MERGE

commit | commitdiff | tree

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

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

commit | commitdiff | tree

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

Merge changes from topic "am-3ca94091-64c7-4524-a9e7-1438a5fc6599" into nyc-mr2-dev

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

commit | commitdiff | tree

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

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

Change-Id: I6f98cfa7f1bc12306c8e28a234d2b0d011068674

commit | commitdiff | tree

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

[automerger skipped] Import translations. DO NOT MERGE skipped: 39a33e2ffb

Change-Id: I817002a824ff75c6764d45d3738518c1603a00ba

commit | commitdiff | tree

Bill Yi [Thu, 25 Jan 2018 14:28:41 +0000 (06:28 -0800)]

Import translations. DO NOT MERGE

Change-Id: I80b1d4aea34253fee5f9f16972f84f3821213925
Auto-generated-cl: translation import

commit | commitdiff | tree

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

[automerger skipped] Import translations. DO NOT MERGE skipped: 9a738cccdb skipped: 10f8c984c0

Change-Id: I4a8b6d977c11f57303700d60526707b632a7c403

commit | commitdiff | tree

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

[automerger skipped] Import translations. DO NOT MERGE skipped: 9a738cccdb

Change-Id: Iae0ea1e87448360321f506ca698d19b5b7812498

commit | commitdiff | tree

Bill Yi [Thu, 25 Jan 2018 14:22:37 +0000 (06:22 -0800)]

Import translations. DO NOT MERGE

Change-Id: Ie4fc80ab24fb6a8f3272a6540e6d93d26b7d5496
Auto-generated-cl: translation import

commit | commitdiff | tree

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

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

Change-Id: I13d150895e8888b73cedb9e78e430609bb13bef0

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 25 Jan 2018 13:30:47 +0000 (13:30 +0000)]

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

Change-Id: I7914f49de4bd92832326b43b8f87b684bb5df85a

commit | commitdiff | tree

Bill Yi [Thu, 25 Jan 2018 13:30:32 +0000 (05:30 -0800)]

Import translations. DO NOT MERGE

Change-Id: Ib1a557b242a301a3244b7683b4d3203e5551e84c
Auto-generated-cl: translation import

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 25 Jan 2018 13:24:45 +0000 (13:24 +0000)]

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

Change-Id: Ibe748c9da6143a7a0421edd05f91209e2513434f

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 25 Jan 2018 13:24:39 +0000 (13:24 +0000)]

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

Change-Id: I5299779ac97c96c9c20707b11006f33403aa61a1

commit | commitdiff | tree

Bill Yi [Thu, 25 Jan 2018 13:24:07 +0000 (05:24 -0800)]

Import translations. DO NOT MERGE

Change-Id: I72bd79c6c16dba3db7513f60fec81b9410e25ff5
Auto-generated-cl: translation import

commit | commitdiff | tree

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

[automerger skipped] Import translations. DO NOT MERGE skipped: 4cd0777c01 skipped: 03130e4fbb

Change-Id: Id7171c69c55a042c6ac6cad743a23960591b9e86

commit | commitdiff | tree

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

[automerger skipped] Import translations. DO NOT MERGE skipped: 4cd0777c01

Change-Id: I697689c9d02095934f558b3b2ce3786170b25305

commit | commitdiff | tree

Bill Yi [Thu, 25 Jan 2018 13:12:24 +0000 (05:12 -0800)]

Import translations. DO NOT MERGE

Change-Id: Ibd7d5723c9c4cdc09efcb30f604ff43a096c5da1
Auto-generated-cl: translation import

commit | commitdiff | tree

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

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

Change-Id: Ief9440db0bc052b439ef05840f7e7cc8c8e5cfe1

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 25 Jan 2018 12:41:43 +0000 (12:41 +0000)]

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

Change-Id: I052916ddfb676ce11c96e18a8bd5ffedc9aec5a5

commit | commitdiff | tree

Bill Yi [Thu, 25 Jan 2018 12:41:01 +0000 (04:41 -0800)]

Import translations. DO NOT MERGE

Change-Id: I7cda19f1d67da8975f8df8372b5a43ff2b54174f
Auto-generated-cl: translation import

commit | commitdiff | tree

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

[automerger skipped] Import translations. DO NOT MERGE skipped: 2c3e611a18 skipped: 218841a6dd

Change-Id: Iad2457215210dc2eb9dfbe4224fdf532da6595e2

commit | commitdiff | tree

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

[automerger skipped] Import translations. DO NOT MERGE skipped: 2c3e611a18

Change-Id: Ie0d7a9db0c88eec27035f319b7ea47f9416caec7

commit | commitdiff | tree

Bill Yi [Thu, 25 Jan 2018 12:22:07 +0000 (04:22 -0800)]

Import translations. DO NOT MERGE

Change-Id: I12725f0c3f63da5ac2a809128b7e4d143b113672
Auto-generated-cl: translation import

commit | commitdiff | tree

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

[automerger skipped] Import translations. DO NOT MERGE skipped: e34cac0486 skipped: a14fb25f93

Change-Id: I93cffeeef1826f04ff75bd61c9fcacbfcfc8668c

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 25 Jan 2018 12:16:54 +0000 (12:16 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: e34cac0486

Change-Id: I45a61272bb4c3ca3a67210778f6fd7ff65553f99

commit | commitdiff | tree

Bill Yi [Thu, 25 Jan 2018 12:16:22 +0000 (04:16 -0800)]

Import translations. DO NOT MERGE

Change-Id: I3040ff1778e9dc85cc004396ec70bf272d73c0f5
Auto-generated-cl: translation import

commit | commitdiff | tree

Pankaj Kanwar [Wed, 24 Jan 2018 23:02:22 +0000 (23:02 +0000)]

Merge "Metrics wifi.proto for connected wifi score" into oc-mr1-dev

commit | commitdiff | tree

TreeHugger Robot [Wed, 24 Jan 2018 18:13:25 +0000 (18:13 +0000)]

Merge "Fixed AUTOFILL_UI_LATENCY metric." into oc-mr1-dev

commit | commitdiff | tree

TreeHugger Robot [Tue, 23 Jan 2018 21:39:09 +0000 (21:39 +0000)]

Merge "DO NOT MERGE - fix AFM.getComponentNameFromContext()" into oc-mr1-dev

commit | commitdiff | tree

Felipe Leme [Mon, 22 Jan 2018 23:33:40 +0000 (15:33 -0800)]

DO NOT MERGE - fix AFM.getComponentNameFromContext()

This method broke on O-MR1 when I3abf999eb6056c1df7982780bae43b58337c0668
was chery-picked from master.

Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases \
-t android.autofillservice.cts.AttachedContextActivityTest#testAutofill
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases

Also individually ran tests that failed (due to flakiness) when ran in a suite:

Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases \
-t android.autofillservice.cts.OptionalSaveActivityTest#testDontShowSaveUiWhenUserManuallyFilled_oneDatasetAllRequiredFields

Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases -t android.autofillservice.cts.PreSimpleSaveActivityTest #testTapLink_tapBack_thenStartOverBySayingYesAndManualRequest

Fixes: 71960322

Change-Id: Ia093dcefe6699dc9493c46d671e48c2000214b31
Merged-In: I3abf999eb6056c1df7982780bae43b58337c0668

commit | commitdiff | tree

Michael Plass [Fri, 6 Oct 2017 17:29:51 +0000 (10:29 -0700)]

Metrics wifi.proto for connected wifi score

(cherry picked from commit bb367b689605d0ca3641984b4d59bbe13e6861df)

Bug: 67429363
Bug: 71708302
Test: Wifi unit tests

Change-Id: I2993a02e7b3199c2b50dc2ddb7704fc5b6364025
Merged-In: I315613b8ea3aa1d02810ae376c76083d80865d31

commit | commitdiff | tree

Felipe Leme [Thu, 18 Jan 2018 23:21:36 +0000 (15:21 -0800)]

Fixed AUTOFILL_UI_LATENCY metric.

This metric was using the RESERVED_FOR_LOGBUILDER_COUNTER and hence was not
being picked up.

Bug: 71863561
Fixes: 72175011

Test: adb shell logcat -b events | grep sysui | grep 1136
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases

Change-Id: I34f701ff5336a413477fd14172d16d8d1e5403ad

commit | commitdiff | tree

TreeHugger Robot [Wed, 17 Jan 2018 20:36:06 +0000 (20:36 +0000)]

Merge "Add metric for anomaly detection" into oc-mr1-dev

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 16 Jan 2018 23:42:30 +0000 (23:42 +0000)]

[automerger skipped] RESTRICT AUTOMERGE Preventing recursive referrence in drawables skipped: cee125012a am: 9b90490d1d

Change-Id: If121edaf0d2edac5688ff2aa4ed48da1d5e1c1c7

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 16 Jan 2018 23:42:24 +0000 (23:42 +0000)]

[automerger skipped] RESTRICT AUTOMERGE Preventing recursive referrence in drawables skipped: cee125012a

Change-Id: Ie180da5d659b106e1c5299b0a46b6cbf24548ae0

commit | commitdiff | tree

Sunny Goyal [Wed, 1 Nov 2017 18:58:13 +0000 (11:58 -0700)]

RESTRICT AUTOMERGE Preventing recursive referrence in drawables

Bug: 68706673
Bug: 66498711
Test: Added CTS tests

Change-Id: I8034f49d16f9a7bc1749714fd6d6231bba5088d0
(cherry picked from commit I8034f49d16f9a7bc1749714fd6d6231bba5088d0)
Merged-In: I8034f49d16f9a7bc1749714fd6d6231bba5088d0

commit | commitdiff | tree

Hyunyoung Song [Fri, 12 Jan 2018 05:44:25 +0000 (05:44 +0000)]

Merge "Wrap StackOverflowError in NotFoundException. Bug: 67462465 Bug: 66498711 Test: builds and tested using faulty apk with recursive drawable. Change-Id: I47691343dae892beb5ed8c1c66c33edefade321e (cherry picked from commit dc92d925d819d2c385c04e49369e8574fa111d14)" into oc-dev am: 48df033607
am: 69d240d584

Change-Id: I02bf540b41fd9fd026fbe0fad4069526664cd56f

commit | commitdiff | tree

Hyunyoung Song [Fri, 12 Jan 2018 05:31:38 +0000 (05:31 +0000)]

Merge "Wrap StackOverflowError in NotFoundException. Bug: 67462465 Bug: 66498711 Test: builds and tested using faulty apk with recursive drawable. Change-Id: I47691343dae892beb5ed8c1c66c33edefade321e (cherry picked from commit dc92d925d819d2c385c04e49369e8574fa111d14)" into oc-dev
am: 48df033607

Change-Id: Id2510b388bf4ed9cdd8853bc5594349df358f465

commit | commitdiff | tree

TreeHugger Robot [Fri, 12 Jan 2018 05:23:45 +0000 (05:23 +0000)]

commit | commitdiff | tree

TreeHugger Robot [Thu, 11 Jan 2018 20:50:20 +0000 (20:50 +0000)]

Merge "PaintMeasureTextTest: only pause/resume not_cached benchmarks" into oc-mr1-dev

commit | commitdiff | tree

Tyler Gunn [Thu, 11 Jan 2018 19:43:12 +0000 (19:43 +0000)]

Merge "Add support for notification of LTE to WIFI handover for video calls." into oc-mr1-dev

frameworks/base

RSS Atom

About OSDN

Find Software

Develop Software

Help