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

Jordan Liu [Fri, 6 Jul 2018 19:25:08 +0000 (12:25 -0700)]

Merge "Type Allocation Code & Manufacturer Code" am: ff801e5fd7 am: 50f29d8ecf
am: bf4acfb71b

Change-Id: I8d4cb6a658f2e9d09b9904c722218ef594fb694a

commit | commitdiff | tree

Jordan Liu [Fri, 6 Jul 2018 19:15:49 +0000 (12:15 -0700)]

Merge "Type Allocation Code & Manufacturer Code" am: ff801e5fd7
am: 50f29d8ecf

Change-Id: Ia5ee66c5f99ddd0700bc971ba895c73594e9a517

commit | commitdiff | tree

Jordan Liu [Fri, 6 Jul 2018 19:06:39 +0000 (12:06 -0700)]

Merge "Type Allocation Code & Manufacturer Code"
am: ff801e5fd7

Change-Id: I95b5fd3d2fb977db3f37dcf23c2125c521c1ccd1

commit | commitdiff | tree

Jordan Liu [Fri, 6 Jul 2018 17:51:42 +0000 (17:51 +0000)]

Merge "Type Allocation Code & Manufacturer Code"

commit | commitdiff | tree

zhouwenjie [Fri, 6 Jul 2018 17:23:00 +0000 (10:23 -0700)]

Upate BatteryStats version after fixing mMinLearnedBatteryCapacity
calculation.

Bug: 111132682
Test: manual
Change-Id: Ie2964bbc8480c8758b7b54e25ec9e95a329a2285

commit | commitdiff | tree

TreeHugger Robot [Fri, 6 Jul 2018 17:17:15 +0000 (17:17 +0000)]

Merge "Transforms uid to packages for the raw data"

commit | commitdiff | tree

Neil Fuller [Fri, 6 Jul 2018 17:05:44 +0000 (10:05 -0700)]

resolve merge conflicts of 7980b19bc8fa1fb0c4b4b3abea891d6e245b3edd to stage-aosp-master am: 3147288c3b
am: f53c7a2ae5

Change-Id: Id591cb0be593fd6e0e742c8e323f5a9cae21c30b

commit | commitdiff | tree

Neil Fuller [Fri, 6 Jul 2018 16:59:52 +0000 (09:59 -0700)]

resolve merge conflicts of 7980b19bc8fa1fb0c4b4b3abea891d6e245b3edd to stage-aosp-master
am: 3147288c3b

Change-Id: Ie04ef5cd3277271304c3564ee6e41d8c24dee74c

commit | commitdiff | tree

TreeHugger Robot [Fri, 6 Jul 2018 15:47:23 +0000 (15:47 +0000)]

Merge "MediaPlayer2: merge EventHandler with TaskHandler"

commit | commitdiff | tree

Neil Fuller [Fri, 6 Jul 2018 15:32:44 +0000 (16:32 +0100)]

resolve merge conflicts of 7980b19bc8fa1fb0c4b4b3abea891d6e245b3edd to stage-aosp-master

BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ica0d3578c6e3fcd17b350f63b4acd471774ac014

commit | commitdiff | tree

Olivier Gaillard [Fri, 6 Jul 2018 14:21:13 +0000 (15:21 +0100)]

Transforms uid to packages for the raw data

Test: manual

Change-Id: I8d6ef245bb42a1f1c058dc43e23e82f2a8b70264

commit | commitdiff | tree

Treehugger Robot [Fri, 6 Jul 2018 13:58:29 +0000 (13:58 +0000)]

Merge "Track changes in libcore to remove a constructor"

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 08:58:28 +0000 (01:58 -0700)]

Merge changes from topic "am-59bde7f2-9903-448c-9ad1-8364ed396cf3" into oc-dev am: cec93100ea am: 7557661787 am: 199b3ee0d8 am: 6dc57344d6
am: 4fc0ab5d7f

Change-Id: I207cbc6261c814170a1018cf3403df55d7144321

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 08:48:02 +0000 (01:48 -0700)]

[automerger skipped] Import translations. DO NOT MERGE skipped: c28b092c5e skipped: 33cf864720 am: c6d9bee144 -s ours am: bf6bbefe57 -s ours am: c1a9ad2a19 -s ours am: 648f0b4c44 -s ours
am: 1beddd17c3 -s ours

Change-Id: I498947d7b1119c44028c66f38f2b453518ae1f07

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 08:41:27 +0000 (01:41 -0700)]

Merge changes from topic "am-8b8b3d01-a327-4923-ae09-35940a00b1b3" into oc-dev am: 72e16b1754 am: af687adf49 am: f9a749eb82 am: b5334fff17
am: 6275ee519c

Change-Id: Ic94c73ecf0c37fab0c651c4c3fcf9f08866d2925

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 08:31:10 +0000 (01:31 -0700)]

[automerger skipped] Import translations. DO NOT MERGE skipped: e35f1fdbae skipped: 39c48a1168 am: a05627322f -s ours am: a8276b8de4 -s ours am: 1080ba61c3 -s ours am: 0ae92cd7fa -s ours
am: 611fb78256 -s ours

Change-Id: I31cfb9f9fbf6b877409aff2add037e66a92e4e24

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 08:25:24 +0000 (01:25 -0700)]

Merge changes from topic "am-59bde7f2-9903-448c-9ad1-8364ed396cf3" into oc-dev am: cec93100ea am: 7557661787 am: 199b3ee0d8
am: 6dc57344d6

Change-Id: I9444a409941d6a8c99fea77647c882c234130e81

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 08:15:58 +0000 (01:15 -0700)]

[automerger skipped] Import translations. DO NOT MERGE skipped: c28b092c5e skipped: 33cf864720 am: c6d9bee144 -s ours am: bf6bbefe57 -s ours am: c1a9ad2a19 -s ours
am: 648f0b4c44 -s ours

Change-Id: I215661853a8dbeba6c09f509e549cd1e89b01357

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 07:58:10 +0000 (00:58 -0700)]

Merge changes from topic "am-5c22e81a-5f3d-46c4-9d8f-58c6edfac103" into oc-dev am: 6005492cb2 am: 851e826783 am: e2a7c24f03 am: d91868aee5
am: 539952c444

Change-Id: Icac62977b9436b668d92698523a0973a44576a73

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 07:57:55 +0000 (00:57 -0700)]

Merge changes from topic "am-8b8b3d01-a327-4923-ae09-35940a00b1b3" into oc-dev am: 72e16b1754 am: af687adf49 am: f9a749eb82
am: b5334fff17

Change-Id: I2e7f90604338e5d7d8139244167c540a617d8507

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 07:48:40 +0000 (00:48 -0700)]

[automerger skipped] Import translations. DO NOT MERGE skipped: e35f1fdbae skipped: 39c48a1168 am: a05627322f -s ours am: a8276b8de4 -s ours am: 1080ba61c3 -s ours
am: 0ae92cd7fa -s ours

Change-Id: Id975cb72fd89e421060606ae98a5f652bbb2b384

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 07:47:24 +0000 (00:47 -0700)]

[automerger skipped] Import translations. DO NOT MERGE skipped: ff2f705557 skipped: 4740838b56 am: 8700285134 -s ours am: f2ea6f55d9 -s ours am: 9bf5cb9b7f -s ours am: 8dfe2e787c -s ours
am: dff3f6a527 -s ours

Change-Id: I4d4913306c013728d1018e40485eef6318825607

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 07:42:28 +0000 (00:42 -0700)]

Merge changes from topic "am-5c22e81a-5f3d-46c4-9d8f-58c6edfac103" into oc-dev am: 6005492cb2 am: 851e826783 am: e2a7c24f03
am: d91868aee5

Change-Id: Id7a9ce4822a524a29a0aafbdb99304c258414439

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 07:39:40 +0000 (00:39 -0700)]

Merge changes from topic "am-dd912fb1-a10b-413b-b531-a015abbbf9e3" into oc-dev am: 37d9749e81 am: b434b0c169 am: 086abb7a59 am: cd74671aa7
am: 5b29095f7d

Change-Id: Id8ce3de87039e57f84e6bdcdc24642ec72f221e6

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 07:33:24 +0000 (00:33 -0700)]

[automerger skipped] Import translations. DO NOT MERGE skipped: ff2f705557 skipped: 4740838b56 am: 8700285134 -s ours am: f2ea6f55d9 -s ours am: 9bf5cb9b7f -s ours
am: 8dfe2e787c -s ours

Change-Id: I0ec5b6c4975d95cb806d98e99d950de77a953f8e

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 07:29:19 +0000 (00:29 -0700)]

[automerger skipped] Import translations. DO NOT MERGE skipped: f02d29629d skipped: ace44c1ee6 am: eacf5ffefb -s ours am: 67f18d810a -s ours am: d635022d93 -s ours am: 84729fca53 -s ours
am: 87829f5f24 -s ours

Change-Id: Ic012413a6e55e25133735406afc86c9d603db0b0

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 07:27:06 +0000 (00:27 -0700)]

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

Change-Id: I319b9c8b5898be896d4c2b1a0f25542d6fde1145

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 07:19:04 +0000 (00:19 -0700)]

Merge changes from topic "am-20b78215-c47d-481a-9e96-79127da1c87c" into oc-dev am: c1dc805861 am: 812ec62a14 am: c3ff91a225 am: 12835665f3
am: 3fab85bffd

Change-Id: Ibc6404d2b900f9f70b38c152a62d4609aeeb4d96

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 07:18:14 +0000 (00:18 -0700)]

[automerger skipped] Import translations. DO NOT MERGE skipped: f02d29629d skipped: ace44c1ee6 am: eacf5ffefb -s ours am: 67f18d810a -s ours am: d635022d93 -s ours
am: 84729fca53 -s ours

Change-Id: I42ba97e9889d62b3a82252b534a3bdae1d81452c

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 07:08:45 +0000 (00:08 -0700)]

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

Change-Id: I2014ae9c9458f39ccabac064fc1c06bdaaf7dfa1

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 06:40:19 +0000 (23:40 -0700)]

Merge changes from topic "am-59bde7f2-9903-448c-9ad1-8364ed396cf3" into oc-dev am: cec93100ea am: 7557661787
am: 199b3ee0d8

Change-Id: I7330886e1c2ddcbb92c1a3fa03e9a4a8276d31a2

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 06:32:52 +0000 (23:32 -0700)]

[automerger skipped] Import translations. DO NOT MERGE skipped: c28b092c5e skipped: 33cf864720 am: c6d9bee144 -s ours am: bf6bbefe57 -s ours
am: c1a9ad2a19 -s ours

Change-Id: Ib512c45c735b6259220d2e0934fa6132f533d421

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 06:25:25 +0000 (23:25 -0700)]

Merge changes from topic "am-8b8b3d01-a327-4923-ae09-35940a00b1b3" into oc-dev am: 72e16b1754 am: af687adf49
am: f9a749eb82

Change-Id: I4d285431b8384196b449c43360a118eddf98f15d

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 06:17:39 +0000 (23:17 -0700)]

[automerger skipped] Import translations. DO NOT MERGE skipped: e35f1fdbae skipped: 39c48a1168 am: a05627322f -s ours am: a8276b8de4 -s ours
am: 1080ba61c3 -s ours

Change-Id: I3284bfe82cef35b5e4b30c686f2fb5c381e858a8

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 06:12:01 +0000 (23:12 -0700)]

Merge changes from topic "am-5c22e81a-5f3d-46c4-9d8f-58c6edfac103" into oc-dev am: 6005492cb2 am: 851e826783
am: e2a7c24f03

Change-Id: Ie4e2d6c9fe04adc0d26dc2d7a4d9e7c8ef89fb74

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 06:04:17 +0000 (23:04 -0700)]

[automerger skipped] Import translations. DO NOT MERGE skipped: ff2f705557 skipped: 4740838b56 am: 8700285134 -s ours am: f2ea6f55d9 -s ours
am: 9bf5cb9b7f -s ours

Change-Id: I92f228dd4920d493591d44e4ab6e7e6b731d9e8a

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 05:38:26 +0000 (22:38 -0700)]

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

Change-Id: I50abf9cc8aeb4c0086c9f2b4d3f7620853d7d0cc

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 05:36:46 +0000 (22:36 -0700)]

Merge changes from topic "am-59bde7f2-9903-448c-9ad1-8364ed396cf3" into oc-dev am: cec93100ea
am: 7557661787

Change-Id: I543dafa974e9f5c677957fd19d6f03fcf796213a

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 05:30:53 +0000 (22:30 -0700)]

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

Change-Id: I21b5b66696cb1f6c6683e46c82ee71a7d8751c24

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 05:30:27 +0000 (22:30 -0700)]

[automerger skipped] Import translations. DO NOT MERGE skipped: c28b092c5e skipped: 33cf864720 am: c6d9bee144 -s ours
am: bf6bbefe57 -s ours

Change-Id: Ife52c79c0b85d9f09f1d2cf7b792239aaae24868

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 05:25:31 +0000 (22:25 -0700)]

Merge changes from topic "am-8b8b3d01-a327-4923-ae09-35940a00b1b3" into oc-dev am: 72e16b1754
am: af687adf49

Change-Id: I3885703da8f3f7bfe6b72c25d1f3ed19d6aeac9a

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 05:23:02 +0000 (22:23 -0700)]

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

Change-Id: Ie2ae1dfe4d816b85fa47d77188cdc654eaa9b3dd

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 05:18:16 +0000 (22:18 -0700)]

[automerger skipped] Import translations. DO NOT MERGE skipped: e35f1fdbae skipped: 39c48a1168 am: a05627322f -s ours
am: a8276b8de4 -s ours

Change-Id: I13817952fd66ca2501a35a0e1223bc7d932a2ddc

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 05:12:53 +0000 (22:12 -0700)]

Merge changes from topic "am-5c22e81a-5f3d-46c4-9d8f-58c6edfac103" into oc-dev am: 6005492cb2
am: 851e826783

Change-Id: I1b866e81f48a4d642657cd963fd8e04faa3c1537

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 05:12:52 +0000 (22:12 -0700)]

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

Change-Id: I9a04d7182cab26789a590f9a37b9c636a2a1406c

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 05:05:37 +0000 (22:05 -0700)]

[automerger skipped] Import translations. DO NOT MERGE skipped: ff2f705557 skipped: 4740838b56 am: 8700285134 -s ours
am: f2ea6f55d9 -s ours

Change-Id: Ic88b3b3dcc9ed3148c6e3d150705e7f40b36c8d0

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 05:02:12 +0000 (22:02 -0700)]

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

Change-Id: I69dc7a8329df67e668addcd07d288709230cf48e

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 05:00:12 +0000 (22:00 -0700)]

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

Change-Id: I817b45781ecea994292c346d9e3bd4584e0f2d1f

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 04:53:48 +0000 (21:53 -0700)]

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

Change-Id: Icb43cc60577ca81ada301f283b9e3e1bf4cf6ccc

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 04:53:26 +0000 (21:53 -0700)]

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

Change-Id: Ifaeaf651a92fd5bd261180f0aaa68bb2da521fc0

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 04:48:16 +0000 (21:48 -0700)]

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

Change-Id: I66ce801571d91b5e3791a57cebfe9b56715515b7

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 04:43:38 +0000 (21:43 -0700)]

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

Change-Id: I0a2d432593a5e184df6af1e302268e9ed1d24098

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 04:41:17 +0000 (21:41 -0700)]

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

Change-Id: Ib39dfb279c982016f6102a4ee6d26e6e5f925d91

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 04:32:40 +0000 (21:32 -0700)]

[automerger skipped] Import translations. DO NOT MERGE skipped: cd4aea64f6 skipped: f028c34cdc am: 9204ce40e4 -s ours am: e45b804b65 -s ours am: d9d9d1daca -s ours am: 9f950537e4 -s ours
am: 64b9fb51ec -s ours

Change-Id: Iac6d352d8c07dcb03b62bde0ff7b6f917ad30780

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 04:21:38 +0000 (21:21 -0700)]

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

Change-Id: I1a6a0df3694acd7bc47cde041b94f7a1902a25f3

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 04:18:08 +0000 (21:18 -0700)]

Merge changes from topic "am-59bde7f2-9903-448c-9ad1-8364ed396cf3" into oc-dev
am: cec93100ea

Change-Id: If8c2cd293875724b99a5177c7235ffbeb64c396e

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 04:15:54 +0000 (21:15 -0700)]

[automerger skipped] Import translations. DO NOT MERGE skipped: c28b092c5e skipped: 33cf864720
am: c6d9bee144 -s ours

Change-Id: If1145747718e78a0ad5f60015aa0398e1813c078

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 04:11:50 +0000 (21:11 -0700)]

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

Change-Id: I14c71ce82a5d857ef9bdabb7015c582db1dcb3f0

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 04:11:19 +0000 (21:11 -0700)]

Merge changes from topic "am-8b8b3d01-a327-4923-ae09-35940a00b1b3" into oc-dev
am: 72e16b1754

Change-Id: I75a0f507a546413eeee64870ba94be647ee5de11

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 04:08:51 +0000 (21:08 -0700)]

[automerger skipped] Import translations. DO NOT MERGE skipped: e35f1fdbae skipped: 39c48a1168
am: a05627322f -s ours

Change-Id: I8b0805714082f83552ebb6cbd8290bcd0c39d6cd

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 04:05:33 +0000 (21:05 -0700)]

[automerger skipped] Import translations. DO NOT MERGE skipped: f8ecf21228 skipped: b586d4e9ab am: b3bf111bd5 -s ours am: 4065ce8773 -s ours am: 03e1c5f227 -s ours am: 05968703a2 -s ours
am: 4a4b554061 -s ours

Change-Id: I91b22ce4464a7af4f3184a2ab47b89c318272b76

commit | commitdiff | tree

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

Merge changes from topic "am-5c22e81a-5f3d-46c4-9d8f-58c6edfac103" into oc-dev
am: 6005492cb2

Change-Id: I71789a270fc86b5fc9c74c0de2cd122f1ac26c5e

commit | commitdiff | tree

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

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

Change-Id: I0eeeb695d9125b05d136700b3e03157c25a302fc

commit | commitdiff | tree

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

[automerger skipped] Import translations. DO NOT MERGE skipped: ff2f705557 skipped: 4740838b56
am: 8700285134 -s ours

Change-Id: Ice563d38360e1be62c5f6b869dc69f1ce5dfff24

commit | commitdiff | tree

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:48:58 +0000 (20:48 -0700)]

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

Change-Id: Id13c67950da4a13f9035c0e35b903237948f61a5

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:34:56 +0000 (20:34 -0700)]

[automerger skipped] Import translations. DO NOT MERGE skipped: f8ecf21228 skipped: b586d4e9ab am: b3bf111bd5 -s ours am: 4065ce8773 -s ours am: 03e1c5f227 -s ours
am: 05968703a2 -s ours

Change-Id: Iaaa67b162ee173f0b3ddb22c1b22d8997c3d6bc7

commit | commitdiff | tree

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

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

Change-Id: Ia57f2327964435888de185ed3cd461f6299daa62

commit | commitdiff | tree

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

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

Change-Id: Iae41c56e1a5007b66a1a880d1ef5e4a351a5ca63

commit | commitdiff | tree

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

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

Change-Id: Iddcf2126b4c25970d87e3f90a66033a9a09c5ace

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

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

Change-Id: I2f05f7f47f5e7aed365bee09afc30b019cb73993

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:55:05 +0000 (02:55 +0000)]

Merge changes from topic "am-59bde7f2-9903-448c-9ad1-8364ed396cf3" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: c28b092c5e skipped: 33cf864720
  [automerger skipped] Import translations. DO NOT MERGE skipped: c28b092c5e
  Import translations. DO NOT MERGE

commit | commitdiff | tree

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

Merge changes from topic "am-8b8b3d01-a327-4923-ae09-35940a00b1b3" into oc-dev

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

commit | commitdiff | tree

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

Merge changes from topic "am-5c22e81a-5f3d-46c4-9d8f-58c6edfac103" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: ff2f705557 skipped: 4740838b56
  [automerger skipped] Import translations. DO NOT MERGE skipped: ff2f705557
  Import translations. DO NOT MERGE

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

TreeHugger Robot [Fri, 6 Jul 2018 02:17:24 +0000 (02:17 +0000)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

TreeHugger Robot [Fri, 6 Jul 2018 02:06:10 +0000 (02:06 +0000)]

Merge "Fix GraphicBuffer creation not to use 0 usage flag"

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 5 Jul 2018 22:39:37 +0000 (22:39 +0000)]

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

Change-Id: I2850da8ee89c8ed1dcfc7fc443eb8a2dcb6346bd

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 5 Jul 2018 22:39:28 +0000 (22:39 +0000)]

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

Change-Id: I66b3bb58351d966fbe38e7448c985206e73af9d5

commit | commitdiff | tree

Bill Yi [Thu, 5 Jul 2018 22:38:55 +0000 (15:38 -0700)]

Import translations. DO NOT MERGE

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

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:56:37 +0000 (20:56 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: ff2f705557 skipped: 4740838b56

Change-Id: I2021f802764dc2314c721ba918c587f235b0f575

commit | commitdiff | tree

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

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

Change-Id: Ia499ffa8340bfbf0f2b1ec7dd515ee5cf65f7fb8

commit | commitdiff | tree

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

Import translations. DO NOT MERGE

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