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

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

Bill Yi [Fri, 6 Jul 2018 03:51:41 +0000 (20:51 -0700)]

Merge changes from topic "am-dd912fb1-a10b-413b-b531-a015abbbf9e3" into oc-dev
am: 37d9749e81

Change-Id: I6258da69f13a1ea21b50d0756315619ef190a526

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 03:49:13 +0000 (20:49 -0700)]

[automerger skipped] Import translations. DO NOT MERGE skipped: f02d29629d skipped: ace44c1ee6
am: eacf5ffefb -s ours

Change-Id: I034e3f1a5916c01dc643cde92bd6f42187b5c480

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 03:44:43 +0000 (20:44 -0700)]

Merge changes from topic "am-20b78215-c47d-481a-9e96-79127da1c87c" into oc-dev
am: c1dc805861

Change-Id: I3a40076fd344300ac6dd812ea2c96012f88e36b0

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 03:42:12 +0000 (20:42 -0700)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 32c08741ec skipped: 8062f299b1
am: 998f40e6c5 -s ours

Change-Id: Ifdbc60e6748887feedc47eb60843d231dae46146

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 03:03:49 +0000 (20:03 -0700)]

Merge changes from topic "am-5f59ad6e-1c79-44f8-a437-eac2cc321cdf" into oc-dev
am: ec4d649d8f

Change-Id: I874acb53e25065d4a9a8018f2f0e69d6d041fa8b

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 03:01:40 +0000 (20:01 -0700)]

[automerger skipped] Import translations. DO NOT MERGE skipped: cd4aea64f6 skipped: f028c34cdc
am: 9204ce40e4 -s ours

Change-Id: Ic798dfd5e7b85f7341d2c929519aa227a95e6f18

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 02:57:42 +0000 (19:57 -0700)]

[automerger skipped] Import translations. DO NOT MERGE skipped: f8ecf21228 skipped: b586d4e9ab
am: b3bf111bd5 -s ours

Change-Id: Ice5c1a283c59a8640868cdc3a8acc4afb97e5468

commit | commitdiff | tree

TreeHugger Robot [Fri, 6 Jul 2018 02:46:29 +0000 (02:46 +0000)]

Merge changes from topic "am-dd912fb1-a10b-413b-b531-a015abbbf9e3" into oc-dev

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

commit | commitdiff | tree

TreeHugger Robot [Fri, 6 Jul 2018 02:45:57 +0000 (02:45 +0000)]

Merge changes from topic "am-20b78215-c47d-481a-9e96-79127da1c87c" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 32c08741ec skipped: 8062f299b1
  [automerger skipped] Import translations. DO NOT MERGE skipped: 32c08741ec
  Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Fri, 6 Jul 2018 02:45:27 +0000 (02:45 +0000)]

Merge changes from topic "am-5f59ad6e-1c79-44f8-a437-eac2cc321cdf" into oc-dev

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

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 5 Jul 2018 21:45:40 +0000 (21:45 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: cd4aea64f6 skipped: f028c34cdc

Change-Id: I5c0a1faf8d1dc7bf5d6fc831b61ab40697a422d5

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 5 Jul 2018 21:45:32 +0000 (21:45 +0000)]

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

Change-Id: I8ba42b65a49ff3e9c30e56dc8664bc8a942b4d25

commit | commitdiff | tree

Bill Yi [Thu, 5 Jul 2018 21:45:03 +0000 (14:45 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 5 Jul 2018 21:38:44 +0000 (21:38 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 32c08741ec skipped: 8062f299b1

Change-Id: I99aab27eecf8e8d5d092cabc316b0d3b68a97b2c

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 5 Jul 2018 21:38:36 +0000 (21:38 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 32c08741ec

Change-Id: I09e334aa2acf3c0d32b27b9d18193450db041c6a

commit | commitdiff | tree

Bill Yi [Thu, 5 Jul 2018 21:38:05 +0000 (14:38 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 5 Jul 2018 21:26:20 +0000 (21:26 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: f02d29629d skipped: ace44c1ee6

Change-Id: I264d10bc17ca14d813f7626ea8c7f3fc48b7d2b7

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 5 Jul 2018 21:26:12 +0000 (21:26 +0000)]

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

Change-Id: I19af9b73c3da999252d25aa656b2ee5898b75662

commit | commitdiff | tree

Bill Yi [Thu, 5 Jul 2018 21:25:39 +0000 (14:25 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 5 Jul 2018 20:32:02 +0000 (20:32 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: f8ecf21228 skipped: b586d4e9ab

Change-Id: Idb16f83382ec0d792c15733b46fe31a99e89552a

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 5 Jul 2018 20:31:54 +0000 (20:31 +0000)]

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

Change-Id: Ie556d4be250c4d6f4ade238bb905455aa0454b73

commit | commitdiff | tree

Bill Yi [Thu, 5 Jul 2018 20:31:17 +0000 (13:31 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Atanas Kirilov [Thu, 28 Jun 2018 00:57:17 +0000 (17:57 -0700)]

Merge changes from topic "am-32ac52b1-d1ae-4650-b9ae-368d8cd519cb" into oc-dev
am: 8b047ec8a2

Change-Id: I0c6522feec4b1baccf3c2c8ffb0d79bdebedb9b2

commit | commitdiff | tree

Atanas Kirilov [Thu, 28 Jun 2018 00:25:10 +0000 (17:25 -0700)]

Merge "Backport Prevent shortcut info package name spoofing" into oc-dev
am: c6dbcc137e

Change-Id: Ib3becad73fadba2be82e44bc6fb4afc3c1921a6a

commit | commitdiff | tree

Atanas Kirilov [Wed, 27 Jun 2018 23:56:45 +0000 (16:56 -0700)]

Merge changes from topic "am-8acf63d1-cfe0-4950-98c3-1d2367987749" into oc-dev
am: 000036eb4c

Change-Id: Ic71e3f93036902b2d9452c05e7cdb6e4df2fb0e0

commit | commitdiff | tree

Atanas Kirilov [Wed, 27 Jun 2018 23:42:36 +0000 (16:42 -0700)]

Merge "Backporting of b/77821568" into oc-dev
am: 9774459633

Change-Id: Ie0d176b94d15be65918b5f67bf9ed7f49f632def

commit | commitdiff | tree

Atanas Kirilov [Wed, 27 Jun 2018 23:29:41 +0000 (23:29 +0000)]

Merge changes from topic "am-32ac52b1-d1ae-4650-b9ae-368d8cd519cb" into oc-dev

* changes:
  [automerger] RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing am: 2f7d50058a am: 06848a3f8f skipped: c3e741e530
  [automerger] RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing am: 2f7d50058a am: 06848a3f8f
  [automerger] RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing am: 2f7d50058a
  RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing

commit | commitdiff | tree

Atanas Kirilov [Wed, 27 Jun 2018 23:29:41 +0000 (23:29 +0000)]

Merge changes from topic "am-32ac52b1-d1ae-4650-b9ae-368d8cd519cb" into nyc-mr2-dev

* changes:
  [automerger] RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing am: 2f7d50058a am: 06848a3f8f
  [automerger] RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing am: 2f7d50058a
  RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing

commit | commitdiff | tree

Atanas Kirilov [Wed, 27 Jun 2018 23:29:41 +0000 (23:29 +0000)]

Merge changes from topic "am-32ac52b1-d1ae-4650-b9ae-368d8cd519cb" into cw-f-dev

* changes:
[automerger] RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing am: 2f7d50058a
RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing

commit | commitdiff | tree

Atanas Kirilov [Wed, 27 Jun 2018 23:26:08 +0000 (23:26 +0000)]

Merge "Backport Prevent shortcut info package name spoofing" into oc-dev

commit | commitdiff | tree

Atanas Kirilov [Wed, 27 Jun 2018 23:25:42 +0000 (23:25 +0000)]

Merge changes from topic "am-8acf63d1-cfe0-4950-98c3-1d2367987749" into oc-dev

* changes:
  [automerger] RESTRICT AUTOMERGE: Backporting of b/77821568 am: 4bc1c2445c am: b9c3b099e4 am: 24d402096e am: 0eda2602cd skipped: 430c4395a3
  [automerger] RESTRICT AUTOMERGE: Backporting of b/77821568 am: 4bc1c2445c am: b9c3b099e4 am: 24d402096e am: 0eda2602cd
  [automerger] RESTRICT AUTOMERGE: Backporting of b/77821568 am: 4bc1c2445c am: b9c3b099e4 am: 24d402096e
  [automerger] RESTRICT AUTOMERGE: Backporting of b/77821568 am: 4bc1c2445c am: b9c3b099e4
  [automerger] RESTRICT AUTOMERGE: Backporting of b/77821568 am: 4bc1c2445c
  RESTRICT AUTOMERGE: Backporting of b/77821568

commit | commitdiff | tree

Atanas Kirilov [Wed, 27 Jun 2018 23:25:42 +0000 (23:25 +0000)]

Merge changes from topic "am-8acf63d1-cfe0-4950-98c3-1d2367987749" into nyc-mr2-dev

* changes:
  [automerger] RESTRICT AUTOMERGE: Backporting of b/77821568 am: 4bc1c2445c am: b9c3b099e4 am: 24d402096e am: 0eda2602cd
  [automerger] RESTRICT AUTOMERGE: Backporting of b/77821568 am: 4bc1c2445c am: b9c3b099e4 am: 24d402096e
  [automerger] RESTRICT AUTOMERGE: Backporting of b/77821568 am: 4bc1c2445c am: b9c3b099e4
  [automerger] RESTRICT AUTOMERGE: Backporting of b/77821568 am: 4bc1c2445c
  RESTRICT AUTOMERGE: Backporting of b/77821568

commit | commitdiff | tree

Atanas Kirilov [Wed, 27 Jun 2018 23:25:42 +0000 (23:25 +0000)]

Merge changes from topic "am-8acf63d1-cfe0-4950-98c3-1d2367987749" into cw-f-dev

* changes:
  [automerger] RESTRICT AUTOMERGE: Backporting of b/77821568 am: 4bc1c2445c am: b9c3b099e4 am: 24d402096e
  [automerger] RESTRICT AUTOMERGE: Backporting of b/77821568 am: 4bc1c2445c am: b9c3b099e4
  [automerger] RESTRICT AUTOMERGE: Backporting of b/77821568 am: 4bc1c2445c
  RESTRICT AUTOMERGE: Backporting of b/77821568

commit | commitdiff | tree

Atanas Kirilov [Wed, 27 Jun 2018 23:25:27 +0000 (23:25 +0000)]

Merge "Backporting of b/77821568" into oc-dev

commit | commitdiff | tree

Bill Yi [Mon, 18 Jun 2018 06:55:44 +0000 (23:55 -0700)]

Merge changes from topic "am-aabaca13-84ab-4de5-bfa1-2add13867c06" into oc-dev
am: 3c047ea7fa

Change-Id: Ie97567da2988d921748f9b4ca86f658a5222f43b

commit | commitdiff | tree

Bill Yi [Mon, 18 Jun 2018 06:53:27 +0000 (23:53 -0700)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 422582d9c4 skipped: b06ba83b23
am: 437da4c13d -s ours

Change-Id: I8227403ab7fa849fcc096d3a0acfa583843abf3b

commit | commitdiff | tree

TreeHugger Robot [Mon, 18 Jun 2018 06:27:04 +0000 (06:27 +0000)]

Merge changes from topic "am-aabaca13-84ab-4de5-bfa1-2add13867c06" into nyc-mr2-dev

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

commit | commitdiff | tree

TreeHugger Robot [Mon, 18 Jun 2018 06:27:04 +0000 (06:27 +0000)]

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

commit | commitdiff | tree

TreeHugger Robot [Mon, 18 Jun 2018 06:27:04 +0000 (06:27 +0000)]

Merge changes from topic "am-aabaca13-84ab-4de5-bfa1-2add13867c06" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 422582d9c4 skipped: b06ba83b23
  [automerger skipped] Import translations. DO NOT MERGE skipped: 422582d9c4
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Bill Yi [Mon, 18 Jun 2018 06:18:56 +0000 (23:18 -0700)]

[automerger skipped] Import translations. DO NOT MERGE skipped: cbc81e618d skipped: 693ad9800b
am: cb1a10f5b6 -s ours

Change-Id: Ib5adcfbe4afabfee3e391ec528272f210b408a10

commit | commitdiff | tree

Android Build Merger (Role) [Sun, 17 Jun 2018 12:14:12 +0000 (12:14 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 422582d9c4 skipped: b06ba83b23

Change-Id: Iae0ad51f828f91b8211e0671900f2ffa1265c655

commit | commitdiff | tree

Android Build Merger (Role) [Sun, 17 Jun 2018 12:14:05 +0000 (12:14 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 422582d9c4

Change-Id: I3f93da28223af89a03736689e7f35a723b864ff5

commit | commitdiff | tree

Bill Yi [Sun, 17 Jun 2018 12:13:32 +0000 (05:13 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Android Build Merger (Role) [Sun, 17 Jun 2018 10:03:39 +0000 (10:03 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: cbc81e618d skipped: 693ad9800b

Change-Id: I387f439df9441d64a658344837e4a2bd0f88a128

commit | commitdiff | tree

Android Build Merger (Role) [Sun, 17 Jun 2018 10:03:31 +0000 (10:03 +0000)]

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

Change-Id: I6a3ddad855bdc4ae74eab3e6e2cd42290176aab4

commit | commitdiff | tree

Bill Yi [Sun, 17 Jun 2018 10:02:56 +0000 (03:02 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Makoto Onuki [Tue, 12 Jun 2018 20:01:42 +0000 (13:01 -0700)]

Backport Prevent shortcut info package name spoofing

Test: cts-tradefed run cts -m CtsShortcutManagerTestCases -t android.content.pm.cts.shortcutmanager.ShortcutManagerFakingPublisherTest
Bug: 109824443

Change-Id: I90443973aaef157d357b98b739572866125b2bbc
Merged-In: I78948446a63b428ae750464194558fd44a658493

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 13 Jun 2018 21:43:03 +0000 (21:43 +0000)]

[automerger] RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing am: 2f7d50058a am: 06848a3f8f skipped: c3e741e530

Change-Id: I7aaf06ed4a169b6db7857a6eaa79358cfce7054b

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 13 Jun 2018 21:42:56 +0000 (21:42 +0000)]

[automerger] RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing am: 2f7d50058a am: 06848a3f8f

Change-Id: I0c720e9e4186238ba33eeceae2da377ba2831c29

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 13 Jun 2018 21:42:48 +0000 (21:42 +0000)]

[automerger] RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing am: 2f7d50058a

Change-Id: I1a8b7786bd91bf8c585da02891dad3ceee9db393

commit | commitdiff | tree

Makoto Onuki [Tue, 12 Jun 2018 20:01:42 +0000 (13:01 -0700)]

RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing

Test: cts-tradefed run cts -m CtsShortcutManagerTestCases -t android.content.pm.cts.shortcutmanager.ShortcutManagerFakingPublisherTest
Bug: 109824443
Change-Id: I80b2680d9c7e067f1a36fc8ad1aac1d315022a71

commit | commitdiff | tree

Hongming Jin [Fri, 18 May 2018 17:47:57 +0000 (10:47 -0700)]

Backporting of b/77821568

Enforce permission check before returning application info
Test: manually tested (see bug for repro steps)
Bug: 77821568

Change-Id: Iec13196250f0e5d8b54fd7060ed40e3fe3fe2827
Merged-In: I7554805c36c0c2552163dad7b07cfc5f552b624e

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 13 Jun 2018 18:09:48 +0000 (18:09 +0000)]

[automerger] RESTRICT AUTOMERGE: Backporting of b/77821568 am: 4bc1c2445c am: b9c3b099e4 am: 24d402096e am: 0eda2602cd skipped: 430c4395a3

Change-Id: I38571525dec3ebc35284cc9a8ae0044a8e9e237c

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 13 Jun 2018 18:09:40 +0000 (18:09 +0000)]

[automerger] RESTRICT AUTOMERGE: Backporting of b/77821568 am: 4bc1c2445c am: b9c3b099e4 am: 24d402096e am: 0eda2602cd

Change-Id: I9692df95413c51715508b664b5bc3ea02462da55

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 13 Jun 2018 18:09:32 +0000 (18:09 +0000)]

[automerger] RESTRICT AUTOMERGE: Backporting of b/77821568 am: 4bc1c2445c am: b9c3b099e4 am: 24d402096e

Change-Id: Ia7340c71283b7f88378e34584b373cce180262ec

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 13 Jun 2018 18:09:24 +0000 (18:09 +0000)]

[automerger] RESTRICT AUTOMERGE: Backporting of b/77821568 am: 4bc1c2445c am: b9c3b099e4

Change-Id: I8a090de1075d6d30590ac1e535de841164753758

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 13 Jun 2018 18:09:16 +0000 (18:09 +0000)]

[automerger] RESTRICT AUTOMERGE: Backporting of b/77821568 am: 4bc1c2445c

Change-Id: I12a6a00f11b2d94d3ac112a2f18284e13062a814

commit | commitdiff | tree

akirilov [Thu, 7 Jun 2018 21:36:25 +0000 (14:36 -0700)]

RESTRICT AUTOMERGE: Backporting of b/77821568

Enforce permission check before returning application info
Test: manually tested (see bug for repro steps)
Bug: 77821568

Change-Id: I5d81345b2d958c2bb0a62bbcb8bd8c714a1cf41e

commit | commitdiff | tree

Bill Yi [Mon, 11 Jun 2018 19:26:55 +0000 (12:26 -0700)]

Merge changes from topic "am-8bf63f1b-ab99-4537-ad90-d648a4dd77b0" into oc-dev
am: c70d882667

Change-Id: I12e4db4d4d67cac9aa22f9c3fab1d141f29eb54b

commit | commitdiff | tree

Bill Yi [Mon, 11 Jun 2018 19:24:25 +0000 (12:24 -0700)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 9f043e5e58 skipped: cc2c91ba39
am: b1615a6d90 -s ours

Change-Id: I9f949a268c9c25c19c731269b3299b4ca2d7aa28

commit | commitdiff | tree

Bill Yi [Mon, 11 Jun 2018 19:19:55 +0000 (12:19 -0700)]

Merge changes from topic "am-8eb97afa-063a-44e2-8d8e-6d5670eb50b6" into oc-dev
am: 836d1db239

Change-Id: I519b06f3c9f41b874d0c1f37f0494bbbd080e50e

commit | commitdiff | tree

Bill Yi [Mon, 11 Jun 2018 19:17:38 +0000 (12:17 -0700)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 5e25fd88a8 skipped: c6a1d32ebe
am: 6d30123999 -s ours

Change-Id: I1f2ad23fa8c9975b1be5e089a4001e5871958aee

commit | commitdiff | tree

Bill Yi [Mon, 11 Jun 2018 18:56:42 +0000 (11:56 -0700)]

Merge changes from topic "am-63639373-f180-4cce-87e9-95ef192ab9ec" into oc-dev
am: 3bbe3c7c93

Change-Id: I15050b23d75c15ca69d1aeadddef4f8f955276ef

commit | commitdiff | tree

Bill Yi [Mon, 11 Jun 2018 18:54:34 +0000 (11:54 -0700)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 0be149db42 skipped: 3c2edd55ce
am: 71f5cfa650 -s ours

Change-Id: Ia5633210e4fced8acfffa5cde6588b3159f1036f

commit | commitdiff | tree

Bill Yi [Mon, 11 Jun 2018 18:50:24 +0000 (11:50 -0700)]

Merge changes from topic "am-da3e9584-98c5-4975-8207-a77d2301579a" into oc-dev
am: bd9caf4c6f

Change-Id: I04decd84fba3ec690b6d77d2880b14245810b4fd

commit | commitdiff | tree

Bill Yi [Mon, 11 Jun 2018 18:48:00 +0000 (11:48 -0700)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 05238c7743 skipped: 5e66cc00a4
am: dafe5854dd -s ours

Change-Id: I7f9086ba7bf5a1754e8dd5e46ccf080b0659b3b0

commit | commitdiff | tree

Bill Yi [Mon, 11 Jun 2018 18:43:54 +0000 (11:43 -0700)]

Merge changes from topic "am-84e9fe64-a976-466c-a8d7-d25febc3ff42" into oc-dev
am: 5b882b9dd7

Change-Id: Ieda6e812da1fb9f3ec55201f606dd4a843f63fd4

commit | commitdiff | tree

Bill Yi [Mon, 11 Jun 2018 18:41:53 +0000 (11:41 -0700)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 1122b10e7d skipped: ab4ca0c33d
am: d82564708f -s ours

Change-Id: Ib7d487392cec9a11e587b50a5b91899a215599a8

commit | commitdiff | tree

Bill Yi [Mon, 11 Jun 2018 18:37:03 +0000 (11:37 -0700)]

Merge changes from topic "am-f1c23412-1f54-4840-90d6-b3eb7b06fc83" into oc-dev
am: 59f13cbb8a

Change-Id: I47a507e5c0142357a69e7520973e4f79d3d158a8

commit | commitdiff | tree

Bill Yi [Mon, 11 Jun 2018 18:35:00 +0000 (11:35 -0700)]

[automerger skipped] Import translations. DO NOT MERGE skipped: ce28dfa9fa skipped: 4f7095b464
am: 124cc34793 -s ours

Change-Id: If5c49902987b4bd076509abf86aafe7407c2525b

commit | commitdiff | tree

Bill Yi [Mon, 11 Jun 2018 18:21:05 +0000 (11:21 -0700)]

[automerger skipped] Import translations. DO NOT MERGE skipped: faed2889f4 skipped: 091681e295
am: 4228af93a7 -s ours

Change-Id: I50958128b0b470ee8d2a3ba83660172f210069c0

commit | commitdiff | tree

TreeHugger Robot [Mon, 11 Jun 2018 18:19:38 +0000 (18:19 +0000)]

Merge changes from topic "am-8bf63f1b-ab99-4537-ad90-d648a4dd77b0" into oc-dev

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

commit | commitdiff | tree

TreeHugger Robot [Mon, 11 Jun 2018 18:19:38 +0000 (18:19 +0000)]

Merge changes from topic "am-8bf63f1b-ab99-4537-ad90-d648a4dd77b0" into nyc-mr2-dev

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

commit | commitdiff | tree

TreeHugger Robot [Mon, 11 Jun 2018 18:19:38 +0000 (18:19 +0000)]

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

commit | commitdiff | tree

TreeHugger Robot [Mon, 11 Jun 2018 18:11:29 +0000 (18:11 +0000)]

Merge changes from topic "am-8eb97afa-063a-44e2-8d8e-6d5670eb50b6" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 5e25fd88a8 skipped: c6a1d32ebe
  [automerger skipped] Import translations. DO NOT MERGE skipped: 5e25fd88a8
  Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Mon, 11 Jun 2018 18:11:29 +0000 (18:11 +0000)]

Merge changes from topic "am-8eb97afa-063a-44e2-8d8e-6d5670eb50b6" into nyc-mr2-dev

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

commit | commitdiff | tree

TreeHugger Robot [Mon, 11 Jun 2018 18:11:29 +0000 (18:11 +0000)]

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

commit | commitdiff | tree

TreeHugger Robot [Mon, 11 Jun 2018 18:06:41 +0000 (18:06 +0000)]

Merge changes from topic "am-63639373-f180-4cce-87e9-95ef192ab9ec" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 0be149db42 skipped: 3c2edd55ce
  [automerger skipped] Import translations. DO NOT MERGE skipped: 0be149db42
  Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Mon, 11 Jun 2018 18:06:41 +0000 (18:06 +0000)]

Merge changes from topic "am-63639373-f180-4cce-87e9-95ef192ab9ec" into nyc-mr2-dev

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

commit | commitdiff | tree

TreeHugger Robot [Mon, 11 Jun 2018 18:06:41 +0000 (18:06 +0000)]

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

commit | commitdiff | tree

TreeHugger Robot [Mon, 11 Jun 2018 18:05:42 +0000 (18:05 +0000)]

Merge changes from topic "am-da3e9584-98c5-4975-8207-a77d2301579a" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 05238c7743 skipped: 5e66cc00a4
  [automerger skipped] Import translations. DO NOT MERGE skipped: 05238c7743
  Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Mon, 11 Jun 2018 18:05:42 +0000 (18:05 +0000)]

Merge changes from topic "am-da3e9584-98c5-4975-8207-a77d2301579a" into nyc-mr2-dev

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

commit | commitdiff | tree

TreeHugger Robot [Mon, 11 Jun 2018 18:05:42 +0000 (18:05 +0000)]

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

commit | commitdiff | tree

TreeHugger Robot [Mon, 11 Jun 2018 18:03:31 +0000 (18:03 +0000)]

Merge changes from topic "am-84e9fe64-a976-466c-a8d7-d25febc3ff42" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 1122b10e7d skipped: ab4ca0c33d
  [automerger skipped] Import translations. DO NOT MERGE skipped: 1122b10e7d
  Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Mon, 11 Jun 2018 18:03:31 +0000 (18:03 +0000)]

Merge changes from topic "am-84e9fe64-a976-466c-a8d7-d25febc3ff42" into nyc-mr2-dev

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

commit | commitdiff | tree

TreeHugger Robot [Mon, 11 Jun 2018 18:03:31 +0000 (18:03 +0000)]

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

commit | commitdiff | tree

TreeHugger Robot [Mon, 11 Jun 2018 18:03:15 +0000 (18:03 +0000)]

Merge changes from topic "am-f1c23412-1f54-4840-90d6-b3eb7b06fc83" into oc-dev

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

commit | commitdiff | tree

TreeHugger Robot [Mon, 11 Jun 2018 18:03:15 +0000 (18:03 +0000)]

Merge changes from topic "am-f1c23412-1f54-4840-90d6-b3eb7b06fc83" into nyc-mr2-dev

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

commit | commitdiff | tree

TreeHugger Robot [Mon, 11 Jun 2018 18:03:15 +0000 (18:03 +0000)]

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

commit | commitdiff | tree

Android Build Merger (Role) [Sun, 10 Jun 2018 06:30:57 +0000 (06:30 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: faed2889f4 skipped: 091681e295

Change-Id: Idb34650f4e4ffa9086addb3fc25cf528c9b60aa8

commit | commitdiff | tree

Android Build Merger (Role) [Sun, 10 Jun 2018 06:30:51 +0000 (06:30 +0000)]

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

Change-Id: Ic0e6aac64c5724221ca6fa3d75d0d0d463cfe9ab

commit | commitdiff | tree

Bill Yi [Sun, 10 Jun 2018 06:30:29 +0000 (23:30 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Android Build Merger (Role) [Sun, 10 Jun 2018 06:24:19 +0000 (06:24 +0000)]

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

Change-Id: I7b5711eabd8f101cc5c268c2469a7f94582e4144

commit | commitdiff | tree

Android Build Merger (Role) [Sun, 10 Jun 2018 06:24:12 +0000 (06:24 +0000)]

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

Change-Id: I6e31b858c5da4119d4c331c2d568cb80e77711b5

commit | commitdiff | tree

Bill Yi [Sun, 10 Jun 2018 06:23:50 +0000 (23:23 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Android Build Merger (Role) [Sun, 10 Jun 2018 05:32:27 +0000 (05:32 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 1122b10e7d skipped: ab4ca0c33d

Change-Id: I86175e2cc228f4675e51e31597dbb8df7139a84d

commit | commitdiff | tree

Android Build Merger (Role) [Sun, 10 Jun 2018 05:32:22 +0000 (05:32 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 1122b10e7d

Change-Id: Iff4d2ee449e66e45d078e3ed7b756de703099f9c

commit | commitdiff | tree

Bill Yi [Sun, 10 Jun 2018 05:32:06 +0000 (22:32 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Android Build Merger (Role) [Sun, 10 Jun 2018 05:26:04 +0000 (05:26 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 0be149db42 skipped: 3c2edd55ce

Change-Id: I73ec9c33f82e9c2e15430a95b61c500e06ae4c38

commit | commitdiff | tree

Android Build Merger (Role) [Sun, 10 Jun 2018 05:25:57 +0000 (05:25 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 0be149db42

Change-Id: I3860b45554cd0577a1aab3242537ff1735339ed3

frameworks/base

RSS Atom

About OSDN

Find Software

Develop Software

Help