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

Bryce Lee [Fri, 7 Jul 2017 03:24:37 +0000 (03:24 +0000)]

Merge "Merge "Revert "Use configuration delta to determine if still in orientation change."" into oc-dr1-dev am: 956647ec3e" into oc-dr1-dev-plus-aosp
am: f59b28acd6

Change-Id: Iddc82041f907a406f74ba5bfc52c04068278c718

commit | commitdiff | tree

Adam Lesinski [Fri, 7 Jul 2017 03:22:24 +0000 (03:22 +0000)]

Merge "Merge "Fix Configuration#updateFrom() when assetsSeq doesn't change" into oc-dr1-dev am: da075a9681" into oc-dr1-dev-plus-aosp
am: 1bcafd657f

Change-Id: I0d56dca8b0f5e81b70507e50ad998543d840b48e

commit | commitdiff | tree

Adam Lesinski [Fri, 7 Jul 2017 03:20:58 +0000 (03:20 +0000)]

Merge "Merge "Fix Configuration#updateFrom() when assetsSeq doesn't change" into oc-dr1-dev am: da075a9681" into oc-dr1-dev-plus-aosp
am: 249f2f8f2c

Change-Id: I726bf135c9d5c571218505ddce342f31bae40740

commit | commitdiff | tree

Lucas Dupin [Fri, 7 Jul 2017 03:18:44 +0000 (03:18 +0000)]

Merge "Merge "Color of the ring around the lock icon" into oc-dr1-dev am: 0903e31e72" into oc-dr1-dev-plus-aosp
am: e48ecd63e0

Change-Id: Ib76a130e4dc2d3c157d02cdfea849f1da1bfa352

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 7 Jul 2017 03:15:06 +0000 (03:15 +0000)]

Merge "Merge "Merge "Hide all color hints references" into oc-dr1-dev am: b1ab0ff21e" into oc-dr1-dev-plus-aosp am: 94a82c6683"

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 7 Jul 2017 03:13:44 +0000 (03:13 +0000)]

Merge "Merge "Merge "Hide all color hints references" into oc-dr1-dev am: b1ab0ff21e" into oc-dr1-dev-plus-aosp am: 94a82c6683"

commit | commitdiff | tree

Lucas Dupin [Fri, 7 Jul 2017 03:12:41 +0000 (03:12 +0000)]

Merge "Merge "Hide all color hints references" into oc-dr1-dev am: b1ab0ff21e" into oc-dr1-dev-plus-aosp
am: 94a82c6683

Change-Id: I9c2ead0e5ca96c282641574da8dd65440cfb267e

commit | commitdiff | tree

Lucas Dupin [Fri, 7 Jul 2017 03:12:02 +0000 (03:12 +0000)]

Merge "Merge "Hide all color hints references" into oc-dr1-dev am: b1ab0ff21e" into oc-dr1-dev-plus-aosp
am: 94a82c6683

Change-Id: Idcaeeee6632f3f8c32f0a4065cb7a681038445ed

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 7 Jul 2017 03:10:21 +0000 (03:10 +0000)]

Merge "Merge "Merge "Hide all color hints references" into oc-dr1-dev am: b1ab0ff21e" into oc-dr1-dev-plus-aosp am: 6e7e4ed024"

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 7 Jul 2017 03:09:32 +0000 (03:09 +0000)]

Merge "Merge "Merge "Hide all color hints references" into oc-dr1-dev am: b1ab0ff21e" into oc-dr1-dev-plus-aosp am: 6e7e4ed024"

commit | commitdiff | tree

Lucas Dupin [Fri, 7 Jul 2017 03:07:59 +0000 (03:07 +0000)]

Merge "Merge "Hide all color hints references" into oc-dr1-dev am: b1ab0ff21e" into oc-dr1-dev-plus-aosp
am: 6e7e4ed024

Change-Id: I7891dc3921a5e75b2e90eef959b32a88d8ef7507

commit | commitdiff | tree

Lucas Dupin [Fri, 7 Jul 2017 03:07:42 +0000 (03:07 +0000)]

Merge "Merge "Hide all color hints references" into oc-dr1-dev am: b1ab0ff21e" into oc-dr1-dev-plus-aosp
am: 6e7e4ed024

Change-Id: I66ba5dd375d68f90ab21a37e37735d0e22a9a933

commit | commitdiff | tree

TreeHugger Robot [Fri, 7 Jul 2017 03:07:26 +0000 (03:07 +0000)]

Merge "Add missing notifyPixelsChanged"

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 7 Jul 2017 03:03:01 +0000 (03:03 +0000)]

Merge "Merge "Merge "Make dun APNs as read-only by default." into oc-dr1-dev am: 730e4a5651" into oc-dr1-dev-plus-aosp am: dbee860173"

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 7 Jul 2017 03:01:38 +0000 (03:01 +0000)]

Merge "Merge "Merge "Make dun APNs as read-only by default." into oc-dr1-dev am: 730e4a5651" into oc-dr1-dev-plus-aosp am: dbee860173"

commit | commitdiff | tree

Amit Mahajan [Fri, 7 Jul 2017 03:01:14 +0000 (03:01 +0000)]

Merge "Merge "Make dun APNs as read-only by default." into oc-dr1-dev am: 730e4a5651" into oc-dr1-dev-plus-aosp
am: dbee860173

Change-Id: Ida502cc100e90d5fa038f82071d8d6efd2ab1b76

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 7 Jul 2017 03:00:20 +0000 (03:00 +0000)]

Merge "Merge "Make dun APNs as read-only by default." into oc-dr1-dev am: 730e4a5651 am: d6c82cde94"

commit | commitdiff | tree

Amit Mahajan [Fri, 7 Jul 2017 03:00:00 +0000 (03:00 +0000)]

Merge "Merge "Make dun APNs as read-only by default." into oc-dr1-dev am: 730e4a5651" into oc-dr1-dev-plus-aosp
am: dbee860173

Change-Id: Ie214fc94b33c82dc0cd67ac9f5388b74fa1393aa

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 7 Jul 2017 02:59:01 +0000 (02:59 +0000)]

Merge "Merge "Make dun APNs as read-only by default." into oc-dr1-dev am: 730e4a5651 am: d6c82cde94"

commit | commitdiff | tree

Amit Mahajan [Fri, 7 Jul 2017 02:57:19 +0000 (02:57 +0000)]

Merge "Make dun APNs as read-only by default." into oc-dr1-dev am: 730e4a5651
am: d6c82cde94

Change-Id: I63d308c39363d698b15478e51c200600a04a6422

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 7 Jul 2017 02:56:56 +0000 (02:56 +0000)]

Merge "Merge "Add a MetricsEvent entry for BT forget device confirm dialog" into oc-dr1-dev am: 3e9d74091c am: 1f4f1774c9"

commit | commitdiff | tree

Amit Mahajan [Fri, 7 Jul 2017 02:56:50 +0000 (02:56 +0000)]

Merge "Make dun APNs as read-only by default." into oc-dr1-dev am: 730e4a5651
am: d6c82cde94

Change-Id: Ia6c2ec49d20c53de9b8022cee342589ef2e87172

commit | commitdiff | tree

Antony Sargent [Fri, 7 Jul 2017 02:54:53 +0000 (02:54 +0000)]

Merge "Add a MetricsEvent entry for BT forget device confirm dialog" into oc-dr1-dev am: 3e9d74091c
am: 1f4f1774c9

Change-Id: Ifc37a8f62becd3bddba8b4b55e6362467c33819c

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 7 Jul 2017 02:54:15 +0000 (02:54 +0000)]

Merge "Merge "Revert "Use configuration delta to determine if still in orientation change."" into oc-dr1-dev am: 956647ec3e" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Antony Sargent [Fri, 7 Jul 2017 02:54:07 +0000 (02:54 +0000)]

Merge "Add a MetricsEvent entry for BT forget device confirm dialog" into oc-dr1-dev am: 3e9d74091c
am: 1f4f1774c9

Change-Id: I17f31a6e43188ae65a62fa549533002a364e774b

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 7 Jul 2017 02:53:58 +0000 (02:53 +0000)]

Merge "Merge "Fix Configuration#updateFrom() when assetsSeq doesn't change" into oc-dr1-dev am: da075a9681" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Bryce Lee [Fri, 7 Jul 2017 02:52:47 +0000 (02:52 +0000)]

Merge "Revert "Use configuration delta to determine if still in orientation change."" into oc-dr1-dev
am: 956647ec3e

Change-Id: I6b5c09d11796f9dd07701ee647c0cb7daa0b46d3

commit | commitdiff | tree

Adam Lesinski [Fri, 7 Jul 2017 02:52:47 +0000 (02:52 +0000)]

Merge "Fix Configuration#updateFrom() when assetsSeq doesn't change" into oc-dr1-dev
am: da075a9681

Change-Id: I131d809cbe0405849193245cb82df643512a2d16

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 7 Jul 2017 02:52:25 +0000 (02:52 +0000)]

Merge "Merge "Fix Configuration#updateFrom() when assetsSeq doesn't change" into oc-dr1-dev am: da075a9681" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Adam Lesinski [Fri, 7 Jul 2017 02:50:55 +0000 (02:50 +0000)]

Merge "Fix Configuration#updateFrom() when assetsSeq doesn't change" into oc-dr1-dev
am: da075a9681

Change-Id: Ic4b22dab0f73fb91b23946946b6e2d30727606df

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 7 Jul 2017 02:50:25 +0000 (02:50 +0000)]

Merge "Merge "Color of the ring around the lock icon" into oc-dr1-dev am: 0903e31e72" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Lucas Dupin [Fri, 7 Jul 2017 02:49:09 +0000 (02:49 +0000)]

Merge "Color of the ring around the lock icon" into oc-dr1-dev
am: 0903e31e72

Change-Id: I4cb8d6e0987543fa9e189c508398ba70d683064d

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 7 Jul 2017 02:48:07 +0000 (02:48 +0000)]

Merge "Merge "Hide all color hints references" into oc-dr1-dev am: b1ab0ff21e" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 7 Jul 2017 02:46:59 +0000 (02:46 +0000)]

Merge changes from topic 'am-ffdf163382234d40a4d305b203191a53'

* changes:
Merge changes from topic 'nci-2.0-part2' into oc-dr1-dev am: 5cb8f220a8 am: 83a4419e46
AID suffix registration. am: 68f719e196 am: 243294170b

commit | commitdiff | tree

Lucas Dupin [Fri, 7 Jul 2017 02:46:15 +0000 (02:46 +0000)]

Merge "Hide all color hints references" into oc-dr1-dev
am: b1ab0ff21e

Change-Id: I3ec45a3d914665dcff0bea651032351c06ca514b

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 7 Jul 2017 02:44:13 +0000 (02:44 +0000)]

Merge "Merge "Hide all color hints references" into oc-dr1-dev am: b1ab0ff21e" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Lucas Dupin [Fri, 7 Jul 2017 02:42:35 +0000 (02:42 +0000)]

Merge "Hide all color hints references" into oc-dr1-dev
am: b1ab0ff21e

Change-Id: I54e5d27f52d197ae2512ab7216e12e11cf5c8c30

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 7 Jul 2017 02:41:11 +0000 (02:41 +0000)]

Merge "Merge "Make dun APNs as read-only by default." into oc-dr1-dev am: 730e4a5651" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Amit Mahajan [Fri, 7 Jul 2017 02:40:05 +0000 (02:40 +0000)]

Merge "Make dun APNs as read-only by default." into oc-dr1-dev
am: 730e4a5651

Change-Id: I9fff601c11c937d83f55275646ddf44a5bdf3acb

commit | commitdiff | tree

Love Khanna [Fri, 7 Jul 2017 02:38:42 +0000 (02:38 +0000)]

Merge changes from topic 'nci-2.0-part2' into oc-dr1-dev am: 5cb8f220a8
am: 83a4419e46

Change-Id: Ic330942b85e2c90e273db81dce9a677ac74490ae

commit | commitdiff | tree

Bryce Lee [Fri, 7 Jul 2017 02:38:38 +0000 (02:38 +0000)]

Merge "Revert "Use configuration delta to determine if still in orientation change."" into oc-dr1-dev

commit | commitdiff | tree

Amit Mahajan [Fri, 7 Jul 2017 02:37:34 +0000 (02:37 +0000)]

Merge "Make dun APNs as read-only by default." into oc-dr1-dev
am: 730e4a5651

Change-Id: Iab30ea34531682e9e4212aa8930232121aa530bd

commit | commitdiff | tree

Love Khanna [Fri, 7 Jul 2017 02:37:25 +0000 (02:37 +0000)]

AID suffix registration. am: 68f719e196
am: 243294170b

Change-Id: I858140b8b5cd368ef2db2391750e52c01bb3ae9f

commit | commitdiff | tree

Love Khanna [Fri, 7 Jul 2017 02:35:31 +0000 (02:35 +0000)]

Merge changes from topic 'nci-2.0-part2' into oc-dr1-dev am: 5cb8f220a8
am: 83a4419e46

Change-Id: I7725724e65f6306ba5d4d4b048dd69b38c2ca5a0

commit | commitdiff | tree

Antony Sargent [Fri, 7 Jul 2017 02:35:12 +0000 (02:35 +0000)]

Merge "Add a MetricsEvent entry for BT forget device confirm dialog" into oc-dr1-dev
am: 3e9d74091c

Change-Id: I43397652ec031b5cc2730dd0f8f2b8a6481a8bbe

commit | commitdiff | tree

Love Khanna [Fri, 7 Jul 2017 02:34:04 +0000 (02:34 +0000)]

AID suffix registration. am: 68f719e196
am: 243294170b

Change-Id: Ie1de1e3ba46ecc30b9028774bfc967a4b95e118b

commit | commitdiff | tree

Love Khanna [Fri, 7 Jul 2017 02:25:27 +0000 (02:25 +0000)]

Merge changes from topic 'nci-2.0-part2' into oc-dr1-dev
am: 5cb8f220a8

Change-Id: I9c91dbb63239a4f7f6b2f1e70a690c0fb35c7119

commit | commitdiff | tree

Love Khanna [Fri, 7 Jul 2017 02:24:26 +0000 (02:24 +0000)]

AID suffix registration.
am: 68f719e196

Change-Id: I41f8fb65218cb6c959f36ac30b604629bd04a1f2

commit | commitdiff | tree

TreeHugger Robot [Fri, 7 Jul 2017 01:38:01 +0000 (01:38 +0000)]

Merge "Fix Configuration#updateFrom() when assetsSeq doesn't change" into oc-dr1-dev

commit | commitdiff | tree

TreeHugger Robot [Fri, 7 Jul 2017 01:35:19 +0000 (01:35 +0000)]

Merge "Change initial value of mStaleScanResults to false."

commit | commitdiff | tree

TreeHugger Robot [Fri, 7 Jul 2017 01:29:54 +0000 (01:29 +0000)]

Merge "Color of the ring around the lock icon" into oc-dr1-dev

commit | commitdiff | tree

Bryce Lee [Fri, 7 Jul 2017 00:51:26 +0000 (17:51 -0700)]

Revert "Use configuration delta to determine if still in orientation change."

This reverts commit 2a0284b1a69b57cc239357c9a5fbb514cf2fc8b2.

Reason for revert: b/63380251
Bug:62846907
Fixes:63380251

Change-Id: I18eb9e478cb2b99980a2e9bff22ba9b32b817f2f

commit | commitdiff | tree

Phil Weaver [Fri, 7 Jul 2017 00:15:15 +0000 (00:15 +0000)]

Merge "Block a11y-changing key events from a11y services"

commit | commitdiff | tree

TreeHugger Robot [Fri, 7 Jul 2017 00:12:08 +0000 (00:12 +0000)]

Merge "Hide all color hints references" into oc-dr1-dev

commit | commitdiff | tree

TreeHugger Robot [Thu, 6 Jul 2017 23:50:32 +0000 (23:50 +0000)]

Merge "Make dun APNs as read-only by default." into oc-dr1-dev

commit | commitdiff | tree

TreeHugger Robot [Thu, 6 Jul 2017 23:46:42 +0000 (23:46 +0000)]

Merge "Add a MetricsEvent entry for BT forget device confirm dialog" into oc-dr1-dev

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 23:46:13 +0000 (23:46 +0000)]

Merge "Merge "Merge "Merge changes from topic 'am-638c543cf14f446eae62e5f283001253' into stage-aosp-master am: 41d6995efa" into oc-dev-plus-aosp am: 4c92af3155" into oc-dr1-dev-plus-aosp am: 3d27bc65dc"

commit | commitdiff | tree

Ruchi Kandoi [Thu, 6 Jul 2017 23:43:55 +0000 (23:43 +0000)]

Merge "Merge "Merge changes from topic 'am-638c543cf14f446eae62e5f283001253' into stage-aosp-master am: 41d6995efa" into oc-dev-plus-aosp am: 4c92af3155" into oc-dr1-dev-plus-aosp
am: 3d27bc65dc

Change-Id: I88eca22d7d1f09c3eb2f964ece56831d00466cdd

commit | commitdiff | tree

Ruchi Kandoi [Thu, 6 Jul 2017 23:41:44 +0000 (23:41 +0000)]

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 23:39:56 +0000 (23:39 +0000)]

Merge changes from topic 'am-bdebc2a52a624c0e9597a1276af750e3'

* changes:
Merge changes from topic 'am-bfe09c8870b04be684c9e4b6fd6ec81d' into oc-dr1-dev-plus-aosp am: 6c6b69ae90
NCI2.0 update LF_T3T_PARAMETERS of 18 byte. am: e7ecebae11 am: 93d313b0a0 am: 06ece4ee26 am: 1120fe1384

commit | commitdiff | tree

Ruchi Kandoi [Thu, 6 Jul 2017 23:37:32 +0000 (23:37 +0000)]

Merge changes from topic 'am-bfe09c8870b04be684c9e4b6fd6ec81d' into oc-dr1-dev-plus-aosp
am: 6c6b69ae90

Change-Id: I6fd75ca717a7fdb8f79b508588aca09497c11cfd

commit | commitdiff | tree

Ruchi Kandoi [Thu, 6 Jul 2017 23:36:21 +0000 (23:36 +0000)]

Merge changes from topic 'am-bfe09c8870b04be684c9e4b6fd6ec81d' into oc-dr1-dev-plus-aosp
am: 6c6b69ae90

Change-Id: Icea9ef0606dfcff469b711f853fc23a9cafabab5

commit | commitdiff | tree

Love Khanna [Thu, 6 Jul 2017 23:35:08 +0000 (23:35 +0000)]

NCI2.0 update LF_T3T_PARAMETERS of 18 byte. am: e7ecebae11 am: 93d313b0a0 am: 06ece4ee26
am: 1120fe1384

Change-Id: I7eab3ea2c7e5765d8deef5b7546de0d52e44326b

commit | commitdiff | tree

Love Khanna [Thu, 6 Jul 2017 23:34:15 +0000 (23:34 +0000)]

NCI2.0 update LF_T3T_PARAMETERS of 18 byte. am: e7ecebae11 am: 93d313b0a0 am: 06ece4ee26
am: 1120fe1384

Change-Id: I84006cc6197cd7423df82347975c545f9030678b

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 23:30:50 +0000 (23:30 +0000)]

Merge changes from topic 'am-44b3d987ba984d118c550089e54512f1'

* changes:
Merge changes from topic 'am-0fe9238e031841a8802281f7e75ee086' into oc-dev-plus-aosp am: 3462f03144 am: 1d2e0c664b
NCI2.0 update LF_T3T_PARAMETERS of 18 byte. am: e7ecebae11 am: 93d313b0a0 am: 06ece4ee26 am: 2e0bed8bc1

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 23:29:07 +0000 (23:29 +0000)]

Merge "Merge "Merge changes from topic 'am-638c543cf14f446eae62e5f283001253' into stage-aosp-master am: 41d6995efa" into oc-dev-plus-aosp am: 4c92af3155" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Ruchi Kandoi [Thu, 6 Jul 2017 23:28:31 +0000 (23:28 +0000)]

Merge changes from topic 'am-0fe9238e031841a8802281f7e75ee086' into oc-dev-plus-aosp am: 3462f03144
am: 1d2e0c664b

Change-Id: Iecb648023e549560c2b4b4ae203c37eeb2b40126

commit | commitdiff | tree

Ruchi Kandoi [Thu, 6 Jul 2017 23:27:39 +0000 (23:27 +0000)]

Merge changes from topic 'am-0fe9238e031841a8802281f7e75ee086' into oc-dev-plus-aosp am: 3462f03144
am: 1d2e0c664b

Change-Id: I09dae668b2cba9e9b109dbab17a2cf95cb49f877

commit | commitdiff | tree

Love Khanna [Thu, 6 Jul 2017 23:27:32 +0000 (23:27 +0000)]

NCI2.0 update LF_T3T_PARAMETERS of 18 byte. am: e7ecebae11 am: 93d313b0a0 am: 06ece4ee26
am: 2e0bed8bc1

Change-Id: I585b9a9be51465174a6882d8cf507cba5c2531d0

commit | commitdiff | tree

Love Khanna [Thu, 6 Jul 2017 23:25:51 +0000 (23:25 +0000)]

NCI2.0 update LF_T3T_PARAMETERS of 18 byte. am: e7ecebae11 am: 93d313b0a0 am: 06ece4ee26
am: 2e0bed8bc1

Change-Id: I230b83c667ba8068f47770095af477ce5fcfd737

commit | commitdiff | tree

Ruchi Kandoi [Thu, 6 Jul 2017 23:24:27 +0000 (23:24 +0000)]

Merge "Merge changes from topic 'am-638c543cf14f446eae62e5f283001253' into stage-aosp-master am: 41d6995efa" into oc-dev-plus-aosp
am: 4c92af3155

Change-Id: I9825dcb653ac21ef0c7b8f2d93addfcbd30e879e

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 23:22:06 +0000 (23:22 +0000)]

Merge changes from topic 'am-4b83778ede42460083008cc1bcbefb4b'

* changes:
Merge changes from topic 'NCI-2.0' am: 430dded515 am: 4d08be4a52 am: 67d3257519 am: a404bfb348
NCI2.0 update LF_T3T_PARAMETERS of 18 byte. am: e7ecebae11 am: 93d313b0a0 am: a161427214 am: 308f484f7c

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 23:22:04 +0000 (23:22 +0000)]

Merge changes from topic 'am-bfe09c8870b04be684c9e4b6fd6ec81d' into oc-dr1-dev-plus-aosp

* changes:
Merge changes from topic 'am-0fe9238e031841a8802281f7e75ee086' into oc-dev-plus-aosp am: 3462f03144
NCI2.0 update LF_T3T_PARAMETERS of 18 byte. am: e7ecebae11 am: 93d313b0a0 am: 06ece4ee26

commit | commitdiff | tree

Ruchi Kandoi [Thu, 6 Jul 2017 23:16:19 +0000 (23:16 +0000)]

Merge changes from topic 'NCI-2.0' am: 430dded515 am: 4d08be4a52 am: 67d3257519
am: a404bfb348

Change-Id: Ieae4a4211b18a03e81068b39948dbfd18272df3d

commit | commitdiff | tree

Ruchi Kandoi [Thu, 6 Jul 2017 23:15:42 +0000 (23:15 +0000)]

Merge changes from topic 'NCI-2.0' am: 430dded515 am: 4d08be4a52 am: 67d3257519
am: a404bfb348

Change-Id: I300bc7d72f21dc42692f69fc32697d484ed3b4f5

commit | commitdiff | tree

Ruchi Kandoi [Thu, 6 Jul 2017 23:15:14 +0000 (23:15 +0000)]

Merge changes from topic 'am-0fe9238e031841a8802281f7e75ee086' into oc-dev-plus-aosp
am: 3462f03144

Change-Id: Ia4abd92331ee0d0684d5014f2b33bbc2101935d0

commit | commitdiff | tree

Love Khanna [Thu, 6 Jul 2017 23:15:04 +0000 (23:15 +0000)]

NCI2.0 update LF_T3T_PARAMETERS of 18 byte. am: e7ecebae11 am: 93d313b0a0 am: a161427214
am: 308f484f7c

Change-Id: I6d1c8f8aee7d82da3b31de0552d73c6710e5663f

commit | commitdiff | tree

Love Khanna [Thu, 6 Jul 2017 23:14:42 +0000 (23:14 +0000)]

NCI2.0 update LF_T3T_PARAMETERS of 18 byte. am: e7ecebae11 am: 93d313b0a0 am: a161427214
am: 308f484f7c

Change-Id: I0e3422104eb914ca126bd4d672f86384d58d2cba

commit | commitdiff | tree

Love Khanna [Thu, 6 Jul 2017 23:14:21 +0000 (23:14 +0000)]

NCI2.0 update LF_T3T_PARAMETERS of 18 byte. am: e7ecebae11 am: 93d313b0a0
am: 06ece4ee26

Change-Id: Ie1d9a3b96fa415eb99f4c8e9f75b2c519734ebd0

commit | commitdiff | tree

Ruchi Kandoi [Thu, 6 Jul 2017 23:13:54 +0000 (23:13 +0000)]

Merge changes from topic 'am-0fe9238e031841a8802281f7e75ee086' into oc-dev-plus-aosp
am: 3462f03144

Change-Id: Ie95b06cd45924664c7a05e649fc96ac4d0f66745

commit | commitdiff | tree

Love Khanna [Thu, 6 Jul 2017 23:11:55 +0000 (23:11 +0000)]

NCI2.0 update LF_T3T_PARAMETERS of 18 byte. am: e7ecebae11 am: 93d313b0a0
am: 06ece4ee26

Change-Id: I0d0fd8bd98c177df117a649a359f919b8af751ed

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 23:06:33 +0000 (23:06 +0000)]

Merge "Merge "Merge "DO NOT MERGE Ensure minimized state is false when dock is gone on exists change" into oc-dr1-dev am: 407c4c5719" into oc-dr1-dev-plus-aosp am: 320c40390d"

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 23:04:57 +0000 (23:04 +0000)]

Merge "Merge changes from topic 'am-638c543cf14f446eae62e5f283001253' into stage-aosp-master am: 41d6995efa" into oc-dev-plus-aosp

commit | commitdiff | tree

Ruchi Kandoi [Thu, 6 Jul 2017 23:04:53 +0000 (23:04 +0000)]

Merge changes from topic 'NCI-2.0' am: 430dded515 am: 4d08be4a52
am: 67d3257519

Change-Id: I77202532d60368ebc18e754a5454eb6fa1b0e5dc

commit | commitdiff | tree

Love Khanna [Thu, 6 Jul 2017 23:03:36 +0000 (23:03 +0000)]

NCI2.0 update LF_T3T_PARAMETERS of 18 byte. am: e7ecebae11 am: 93d313b0a0
am: a161427214

Change-Id: If545ea98d8c8d6a97006bcc455b55e7c665e5a66

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 23:03:29 +0000 (23:03 +0000)]

Merge "Merge "Merge "DO NOT MERGE Ensure minimized state is false when dock is gone on exists change" into oc-dr1-dev am: 407c4c5719" into oc-dr1-dev-plus-aosp am: 320c40390d"

commit | commitdiff | tree

Matthew Ng [Thu, 6 Jul 2017 23:03:18 +0000 (23:03 +0000)]

Merge "Merge "DO NOT MERGE Ensure minimized state is false when dock is gone on exists change" into oc-dr1-dev am: 407c4c5719" into oc-dr1-dev-plus-aosp
am: 320c40390d

Change-Id: I5199361a5563e479c07f0d41ad16ea1f9c7a200b

commit | commitdiff | tree

John Reck [Thu, 6 Jul 2017 22:27:23 +0000 (15:27 -0700)]

Add missing notifyPixelsChanged

Fixes: 63400947
Test: CTS test PixelCopyTest#testReuseBitmap
Change-Id: Iad6fe331f84415528c1858a1fdbf26bce784cd53

commit | commitdiff | tree

Matthew Ng [Thu, 6 Jul 2017 23:01:19 +0000 (23:01 +0000)]

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 23:01:16 +0000 (23:01 +0000)]

Merge "Merge "DO NOT MERGE Ensure minimized state is false when dock is gone on exists change" into oc-dr1-dev am: 407c4c5719 am: 77b4424baa"

commit | commitdiff | tree

Ruchi Kandoi [Thu, 6 Jul 2017 23:00:35 +0000 (23:00 +0000)]

Merge changes from topic 'am-638c543cf14f446eae62e5f283001253' into stage-aosp-master
am: 41d6995efa

Change-Id: I49343d3ee533b8b567edf2c76b9fbc78ad2cd235

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 23:00:21 +0000 (23:00 +0000)]

Merge "Merge "DO NOT MERGE Ensure minimized state is false when dock is gone on exists change" into oc-dr1-dev am: 407c4c5719 am: 77b4424baa"

commit | commitdiff | tree

TreeHugger Robot [Thu, 6 Jul 2017 22:59:47 +0000 (22:59 +0000)]

Merge "Have bit grant permissions to installed APKs."

commit | commitdiff | tree

Matthew Ng [Thu, 6 Jul 2017 22:59:29 +0000 (22:59 +0000)]

Merge "DO NOT MERGE Ensure minimized state is false when dock is gone on exists change" into oc-dr1-dev am: 407c4c5719
am: 77b4424baa

Change-Id: I40c3a5eca13d6f194c6bf116293ae00db4896468

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 22:59:15 +0000 (22:59 +0000)]

Merge changes from topic 'am-0fe9238e031841a8802281f7e75ee086' into oc-dev-plus-aosp

* changes:
Merge changes from topic 'NCI-2.0' am: 430dded515 am: 4d08be4a52
NCI2.0 update LF_T3T_PARAMETERS of 18 byte. am: e7ecebae11 am: 93d313b0a0

commit | commitdiff | tree

Matthew Ng [Thu, 6 Jul 2017 22:58:48 +0000 (22:58 +0000)]

Merge "DO NOT MERGE Ensure minimized state is false when dock is gone on exists change" into oc-dr1-dev am: 407c4c5719
am: 77b4424baa

Change-Id: I6bfe305a741ccbb91967935e083e5f3e18a5e41e

commit | commitdiff | tree

Ruchi Kandoi [Thu, 6 Jul 2017 22:56:47 +0000 (22:56 +0000)]

Merge changes from topic 'NCI-2.0' am: 430dded515
am: 4d08be4a52

Change-Id: Id2b2073acb3b901015b2b0d938a8cb5ee5a0270b

commit | commitdiff | tree

Ruchi Kandoi [Thu, 6 Jul 2017 22:56:19 +0000 (22:56 +0000)]

Merge changes from topic 'NCI-2.0' am: 430dded515
am: 4d08be4a52

Change-Id: Ie427005b3fa448a33c1756afdea66715914c4ff4

commit | commitdiff | tree

Love Khanna [Thu, 6 Jul 2017 22:55:46 +0000 (22:55 +0000)]

NCI2.0 update LF_T3T_PARAMETERS of 18 byte. am: e7ecebae11
am: 93d313b0a0

Change-Id: Iab0bd06f3f3a0d3f632e6bd5bedd8fb7c9831b90

commit | commitdiff | tree

Love Khanna [Thu, 6 Jul 2017 22:55:33 +0000 (22:55 +0000)]

NCI2.0 update LF_T3T_PARAMETERS of 18 byte. am: e7ecebae11
am: 93d313b0a0

Change-Id: If6952f71012f48a789c31775161720dd409bf40b