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

Jean-Michel Trivi [Tue, 12 Jun 2018 05:18:53 +0000 (22:18 -0700)]

Merge "AudioService: fix deallock setBluetoothScoOn vs setMode" into pi-dev
am: 8a12361b8c

Change-Id: Ia47fe3acf3d637d42d0ce3efaa6be1e0718e2acd

commit | commitdiff | tree

TreeHugger Robot [Tue, 12 Jun 2018 03:59:07 +0000 (03:59 +0000)]

Merge "AudioService: fix deallock setBluetoothScoOn vs setMode" into pi-dev

commit | commitdiff | tree

Bill Yi [Tue, 12 Jun 2018 02:09:11 +0000 (19:09 -0700)]

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

Change-Id: I5b5360c99aeb67e14900d178f11faf435b7c42a3

commit | commitdiff | tree

Bill Yi [Tue, 12 Jun 2018 01:59:28 +0000 (18:59 -0700)]

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

Change-Id: Iac4584e21e939ea6f770a64d7e5c16a561741bf8

commit | commitdiff | tree

Bill Yi [Tue, 12 Jun 2018 01:52:55 +0000 (18:52 -0700)]

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

Change-Id: Ia79761d8fb5b1bbdad7a0230dd5d1daef998ead2

commit | commitdiff | tree

Bill Yi [Tue, 12 Jun 2018 01:43:20 +0000 (18:43 -0700)]

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

Change-Id: I556cc2268f3feb0344b21be2f4a57cd15627047d

commit | commitdiff | tree

Bill Yi [Tue, 12 Jun 2018 01:36:57 +0000 (18:36 -0700)]

Merge changes from topic "am-63639373-f180-4cce-87e9-95ef192ab9ec" into oc-dev am: 3bbe3c7c93 am: 24701167ba am: 689cf0f8a2
am: 995c542d0c

Change-Id: I267178d0ab2cf05abdc5d685e139f05cbcc427ca

commit | commitdiff | tree

Bill Yi [Tue, 12 Jun 2018 01:27:17 +0000 (18:27 -0700)]

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

Change-Id: I3856a4767bab27699a68b765287e26b689a3906d

commit | commitdiff | tree

Bill Yi [Tue, 12 Jun 2018 01:21:05 +0000 (18:21 -0700)]

Merge changes from topic "am-da3e9584-98c5-4975-8207-a77d2301579a" into oc-dev am: bd9caf4c6f am: 2b605d89b9 am: 64c1873c30
am: 6dbef2a740

Change-Id: Ibb8f520e2070a880028866931319ccbb60e373af

commit | commitdiff | tree

Bill Yi [Tue, 12 Jun 2018 01:11:30 +0000 (18:11 -0700)]

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

Change-Id: Ia37e5c85013732a3a0e99a6829a58f792b123499

commit | commitdiff | tree

Brad Ebinger [Tue, 12 Jun 2018 00:32:30 +0000 (17:32 -0700)]

[automerger skipped] Merge "Update Docs to clarify using a Message across IPC" am: 0be0692691 -s ours
am: b57dfe26cf -s ours

Change-Id: Ie3294bee1121280f07d34b4ecae451779646678f

commit | commitdiff | tree

Bill Yi [Mon, 11 Jun 2018 22:43:09 +0000 (15:43 -0700)]

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

Change-Id: Idecbdcc5616a974fe75d99667ec4a5e8d37d97c5

commit | commitdiff | tree

Bill Yi [Mon, 11 Jun 2018 22:35:45 +0000 (15:35 -0700)]

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

Change-Id: If954d237d06c522c78198b0fadd8c6394978855a

commit | commitdiff | tree

Brad Ebinger [Mon, 11 Jun 2018 22:24:19 +0000 (15:24 -0700)]

[automerger skipped] Merge "Update Docs to clarify using a Message across IPC"
am: 0be0692691 -s ours

Change-Id: I1d3887c7d4a868a1f1b56c0d2e4f824eef29fb3a

commit | commitdiff | tree

Bill Yi [Mon, 11 Jun 2018 22:17:06 +0000 (15:17 -0700)]

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

Change-Id: I5bff44b8b6e7384eada300a2c904ab11c12e028f

commit | commitdiff | tree

TreeHugger Robot [Mon, 11 Jun 2018 22:10:59 +0000 (22:10 +0000)]

Merge "Remove test-* sources for Metalava api-stubs." into pi-dev-plus-aosp

commit | commitdiff | tree

Bill Yi [Mon, 11 Jun 2018 22:09:52 +0000 (15:09 -0700)]

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

Change-Id: Ie100fd774ad3262f3edf1b5b2baaa3786200dccc

commit | commitdiff | tree

Bill Yi [Mon, 11 Jun 2018 22:04:23 +0000 (15:04 -0700)]

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

Change-Id: I211002b40f5acf9f7ad0a44e4530019df72c3b7c

commit | commitdiff | tree

Bill Yi [Mon, 11 Jun 2018 21:57:09 +0000 (14:57 -0700)]

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

Change-Id: Ieb35e183766df1fae623f85ccb2c3a3291b35085

commit | commitdiff | tree

Bill Yi [Mon, 11 Jun 2018 21:51:44 +0000 (14:51 -0700)]

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

Change-Id: Ie4a67f372f3a7d187a7c7fe9c5d364c460535376

commit | commitdiff | tree

Bill Yi [Mon, 11 Jun 2018 21:44:34 +0000 (14:44 -0700)]

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

Change-Id: If1fa2cf8485670184771de6faf7042b7c7b227eb

commit | commitdiff | tree

Bill Yi [Mon, 11 Jun 2018 21:43:19 +0000 (14:43 -0700)]

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

Change-Id: If96c64288656012f02de0edfd0d8cf7ff26abae4

commit | commitdiff | tree

Bill Yi [Mon, 11 Jun 2018 21:36:55 +0000 (14:36 -0700)]

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

Change-Id: I947aee957d91c286204282e84162e9733ace9018

commit | commitdiff | tree

Bill Yi [Mon, 11 Jun 2018 21:31:45 +0000 (14:31 -0700)]

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

Change-Id: I641ba8de65451ddfab0bd38dcdb09d98f1039fb1

commit | commitdiff | tree

Bill Yi [Mon, 11 Jun 2018 21:25:28 +0000 (14:25 -0700)]

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

Change-Id: Ia4ef7b14406c4f0f15b9d17d107308f93282684b

commit | commitdiff | tree

Bill Yi [Mon, 11 Jun 2018 21:03:15 +0000 (14:03 -0700)]

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

Change-Id: Iff391bdbc66ec59c30f36fc14e9501c7fb770f30

commit | commitdiff | tree

Bill Yi [Mon, 11 Jun 2018 21:01:09 +0000 (14:01 -0700)]

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

Change-Id: I2cc8202e1abaf739a71126665599c3b262f5e7d7

commit | commitdiff | tree

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

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

Change-Id: Ibcaa1f68b57714de2a7295d93d1875274b750071

commit | commitdiff | tree

Bill Yi [Mon, 11 Jun 2018 20:54:10 +0000 (13:54 -0700)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 1122b10e7d skipped: ab4ca0c33d am: d82564708f -s ours am: 2e113959ff -s ours am: 5caff8b3ac -s ours
am: b63aa6d5bb -s ours

Change-Id: I352891e21e30e5d61ac0224f69c1e3fad181d0b8

commit | commitdiff | tree

Bill Yi [Mon, 11 Jun 2018 20:49:02 +0000 (13:49 -0700)]

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

Change-Id: I1686e2207e5764167e1e75fcbf4d0be08bf4590d

commit | commitdiff | tree

Bill Yi [Mon, 11 Jun 2018 20:45:54 +0000 (13:45 -0700)]

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

Change-Id: I65b949695446c745048a29b24c851fcdff714010

commit | commitdiff | tree

Bill Yi [Mon, 11 Jun 2018 20:42:05 +0000 (13:42 -0700)]

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

Change-Id: Ie95321f3e530034575a32399abcb3d07f552c0e9

commit | commitdiff | tree

Bill Yi [Mon, 11 Jun 2018 20:36:21 +0000 (13:36 -0700)]

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

Change-Id: I1467823190040c77c1a523ee9fa6d33a64140f29

commit | commitdiff | tree

Bill Yi [Mon, 11 Jun 2018 20:32:07 +0000 (13:32 -0700)]

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

Change-Id: Ia18e5250d7e91b7a9aa227fbe667c22b325eb85a

commit | commitdiff | tree

Brad Ebinger [Mon, 11 Jun 2018 19:56:07 +0000 (19:56 +0000)]

Merge "Update Docs to clarify using a Message across IPC"

commit | commitdiff | tree

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

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

Change-Id: I372e94fff2918832b307e6e7895636cfe0b218f3

commit | commitdiff | tree

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

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

Change-Id: I23a3341bc16e52343d398489b7e74a7903421cac

commit | commitdiff | tree

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

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

Change-Id: Ib2119bdd41d9266be01a34281f2b414a9d4d6d32

commit | commitdiff | tree

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

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

Change-Id: I4e9f42dca080b08b61f706bb474c31c1ee1db4e5

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 19:10:01 +0000 (12:10 -0700)]

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

Change-Id: Ie7c5f82c79e8844493bd6dc203f294bc0d645150

commit | commitdiff | tree

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

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

Change-Id: I1c2d8f7e5ccffd726c7111bb46e87e74616a28a4

commit | commitdiff | tree

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

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

Change-Id: Id8ad34a3a125dbe8fc7b19399ace436250ecc3a2

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:52:05 +0000 (11:52 -0700)]

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

Change-Id: I92656bba49935224c4b97c8c36aaddeaf7360950

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:45:09 +0000 (11:45 -0700)]

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

Change-Id: I1a8c18e58b587716dccc478fa188931df79d68c4

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:33:02 +0000 (11:33 -0700)]

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

Change-Id: I795a9504ea8873999aff1aed5ffb508787a903a1

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: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: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: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: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: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 17:23:46 +0000 (17:23 +0000)]

Merge "Frameworks: convert platformprotos to soong" into pi-dev-plus-aosp

commit | commitdiff | tree

Andreas Gampe [Mon, 11 Jun 2018 16:21:35 +0000 (09:21 -0700)]

Merge "Framework: Disable native-bridge for non-zygote" am: 05c09faad2
am: 5b2e5d32d6

Change-Id: Iba7d16624a518158a8cbe5de0dc94dc0ccf747fd

commit | commitdiff | tree

Jakub Pawlowski [Mon, 11 Jun 2018 16:16:39 +0000 (09:16 -0700)]

Merge "ScanRecord.getServiceData NPE fix" am: d62f74e806
am: 8d0eb01843

Change-Id: I9a7e94cb51f724da7d089fbe027a06d36ad5ebb4

commit | commitdiff | tree

Andreas Gampe [Mon, 11 Jun 2018 16:11:28 +0000 (09:11 -0700)]

Merge "Framework: Disable native-bridge for non-zygote"
am: 05c09faad2

Change-Id: I2aea1bd9c520ca6bb42bf80bd445da0e86db8136

commit | commitdiff | tree

Jakub Pawlowski [Mon, 11 Jun 2018 16:07:31 +0000 (09:07 -0700)]

Merge "ScanRecord.getServiceData NPE fix"
am: d62f74e806

Change-Id: I11a254cf633dc5cf9a7c53c992bf49b00f3d274e

commit | commitdiff | tree

Treehugger Robot [Mon, 11 Jun 2018 15:23:38 +0000 (15:23 +0000)]

Merge "Framework: Disable native-bridge for non-zygote"

commit | commitdiff | tree

Jakub Pawlowski [Mon, 11 Jun 2018 14:43:57 +0000 (14:43 +0000)]

Merge "ScanRecord.getServiceData NPE fix"

commit | commitdiff | tree

Jakub Pawlowski [Mon, 4 Jun 2018 17:32:06 +0000 (10:32 -0700)]

ScanRecord.getServiceData NPE fix

Bug: 109662587
Change-Id: I0e9653d9cd7e4b748870bacb6fbcecae535ebb2a

commit | commitdiff | tree

Chalard Jean [Mon, 11 Jun 2018 14:16:08 +0000 (07:16 -0700)]

Merge changes Ifd7d73ad,Id79096fa am: bfe3b1a691
am: 9f0df265ba

Change-Id: Ibce24e5d55e728a1a08f534fa91b3be0bbc3b990

commit | commitdiff | tree

Chalard Jean [Mon, 11 Jun 2018 13:12:34 +0000 (06:12 -0700)]

Merge changes Ifd7d73ad,Id79096fa
am: bfe3b1a691

Change-Id: I263f51ba2aafdf8e19e020b2a4f6ff1b8238fa3c

commit | commitdiff | tree

Treehugger Robot [Mon, 11 Jun 2018 11:54:21 +0000 (11:54 +0000)]

Merge changes Ifd7d73ad,Id79096fa

* changes:
Bugfixes in LinkProperties#toString
Cleanup of ConnectivityManager.

commit | commitdiff | tree

Chalard Jean [Thu, 7 Jun 2018 04:28:09 +0000 (13:28 +0900)]

Bugfixes in LinkProperties#toString

We should stop trying to use a human brain to write code

Test: manual
Change-Id: Ifd7d73ad65de0f671466080beacbd97287e17bfe

commit | commitdiff | tree

Chalard Jean [Mon, 4 Jun 2018 07:52:49 +0000 (16:52 +0900)]

Cleanup of ConnectivityManager.

This is not exhaustive, but still an undeniable improvement.

Test: runtest frameworks-net
Change-Id: Id79096faf20eec80de7c17b261ef338b895af1e0

commit | commitdiff | tree

Ryo Hashimoto [Mon, 11 Jun 2018 09:29:56 +0000 (02:29 -0700)]

Merge "Use ParcelFileDescriptor's C++ implementation in libbinder" am: 20e243d627
am: 9e2177b492

Change-Id: Ica2a4ef98eba9a5360398b6d5a05f141e0bb6f93

commit | commitdiff | tree

Ryo Hashimoto [Mon, 11 Jun 2018 08:25:46 +0000 (01:25 -0700)]

Merge "Use ParcelFileDescriptor's C++ implementation in libbinder"
am: 20e243d627

Change-Id: I0bc6158d1c37ee8a02450dee55ca6732d878fde3

commit | commitdiff | tree

Treehugger Robot [Mon, 11 Jun 2018 07:27:41 +0000 (07:27 +0000)]

Merge "Use ParcelFileDescriptor's C++ implementation in libbinder"

commit | commitdiff | tree

Chalard Jean [Mon, 11 Jun 2018 05:17:20 +0000 (22:17 -0700)]

Merge "No-op cleanup of ConnectivityService." am: a190a41b51
am: 4abdbaccb3

Change-Id: I7fae0ed908cca7a4e23c37536f59b4c5df0be862

commit | commitdiff | tree

Chalard Jean [Mon, 11 Jun 2018 05:09:18 +0000 (22:09 -0700)]

Merge "No-op cleanup of ConnectivityService."
am: a190a41b51

Change-Id: I9ec9633a85b8b2298f90419da2a73c540b6e6805

commit | commitdiff | tree

Treehugger Robot [Mon, 11 Jun 2018 04:57:31 +0000 (04:57 +0000)]

Merge "No-op cleanup of ConnectivityService."

commit | commitdiff | tree

junyulai [Mon, 11 Jun 2018 04:51:42 +0000 (21:51 -0700)]

Merge "Copy clat modified linkProperties into new one." am: 33b5abb6f8
am: 0242723e09

Change-Id: If39f47cc2caf6a119ff7e237cd8a06b069dca04e

commit | commitdiff | tree

junyulai [Mon, 11 Jun 2018 04:44:16 +0000 (21:44 -0700)]

Merge "Copy clat modified linkProperties into new one."
am: 33b5abb6f8

Change-Id: Ia1f9ab3d5c3b889beddb4dda56ad3389c4967275

commit | commitdiff | tree

Treehugger Robot [Mon, 11 Jun 2018 03:26:26 +0000 (03:26 +0000)]

Merge "Copy clat modified linkProperties into new one."

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

bsears [Sun, 10 Jun 2018 06:03:35 +0000 (23:03 -0700)]

Merge "Include "emergency calls only" in disabled SIM strings." into pi-dev
am: 9b1f560ee5

Change-Id: I00c1560589e67279a007d182b1a7c0aba9be2f79

commit | commitdiff | tree

bsears [Sun, 10 Jun 2018 05:50:30 +0000 (05:50 +0000)]

Merge "Include "emergency calls only" in disabled SIM strings." into pi-dev

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

commit | commitdiff | tree

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

Import translations. DO NOT MERGE

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