OSDN Git Service

android-x86/frameworks-base.git
7 years agoMake a11y node info parceling more robust am: 1d8eb49073 am: 93c47c9d07 am: 3a7cf1f05...
Phil Weaver [Sat, 8 Apr 2017 00:25:13 +0000 (00:25 +0000)]
Make a11y node info parceling more robust am: 1d8eb49073 am: 93c47c9d07 am: 3a7cf1f057  -s ours am: d3a4f4a33c am: 384e51767d am: e4beeeb423 am: 8e6d10c65f am: ba05c14397 am: 88bd259e8d am: 1552348b31
am: 2da1b658dd

Change-Id: Ie7a69da3ceb6e270e162de5da167560e0fb3dc15

7 years agoMake a11y node info parceling more robust am: 1d8eb49073 am: 93c47c9d07 am: 3a7cf1f05...
Phil Weaver [Sat, 8 Apr 2017 00:17:11 +0000 (00:17 +0000)]
Make a11y node info parceling more robust am: 1d8eb49073 am: 93c47c9d07 am: 3a7cf1f057  -s ours am: d3a4f4a33c am: 384e51767d am: e4beeeb423 am: 8e6d10c65f am: ba05c14397 am: 88bd259e8d
am: 1552348b31

Change-Id: I8736c7cebdc8dc954b6e008e0c61c6b85f4d8fcb

7 years agoMake a11y node info parceling more robust am: 1d8eb49073 am: 93c47c9d07 am: 3a7cf1f05...
Phil Weaver [Sat, 8 Apr 2017 00:09:40 +0000 (00:09 +0000)]
Make a11y node info parceling more robust am: 1d8eb49073 am: 93c47c9d07 am: 3a7cf1f057  -s ours am: d3a4f4a33c am: 384e51767d am: e4beeeb423 am: 8e6d10c65f am: ba05c14397
am: 88bd259e8d

Change-Id: I78596326137bb4fcd01f6f2b9d81787d9ccb9cf9

7 years agoMake a11y node info parceling more robust am: 1d8eb49073 am: 93c47c9d07 am: 3a7cf1f05...
Phil Weaver [Sat, 8 Apr 2017 00:02:10 +0000 (00:02 +0000)]
Make a11y node info parceling more robust am: 1d8eb49073 am: 93c47c9d07 am: 3a7cf1f057  -s ours am: d3a4f4a33c am: 384e51767d am: e4beeeb423 am: 8e6d10c65f
am: ba05c14397

Change-Id: I9b44e3353c2140d074f7eb38342257334330fb6f

7 years agoMake a11y node info parceling more robust am: 1d8eb49073 am: 93c47c9d07 am: 3a7cf1f05...
Phil Weaver [Fri, 7 Apr 2017 23:54:43 +0000 (23:54 +0000)]
Make a11y node info parceling more robust am: 1d8eb49073 am: 93c47c9d07 am: 3a7cf1f057  -s ours am: d3a4f4a33c am: 384e51767d am: e4beeeb423
am: 8e6d10c65f

Change-Id: I6ce318f51b1a7ead1898c6a6c61d9ca5e48f2fd1

7 years agoMake a11y node info parceling more robust am: 1d8eb49073 am: 93c47c9d07 am: 3a7cf1f05...
Phil Weaver [Fri, 7 Apr 2017 23:47:07 +0000 (23:47 +0000)]
Make a11y node info parceling more robust am: 1d8eb49073 am: 93c47c9d07 am: 3a7cf1f057  -s ours am: d3a4f4a33c am: 384e51767d
am: e4beeeb423

Change-Id: I6a369b43c54463330d6aa8a2f4ad9b5f5e46e887

7 years agoMake a11y node info parceling more robust am: 1d8eb49073 am: 93c47c9d07 am: 3a7cf1f05...
Phil Weaver [Fri, 7 Apr 2017 23:43:01 +0000 (23:43 +0000)]
Make a11y node info parceling more robust am: 1d8eb49073 am: 93c47c9d07 am: 3a7cf1f057  -s ours am: d3a4f4a33c
am: 384e51767d

Change-Id: I566fa4ea9d3d15e1a65fbae11d20defb37868dd6

7 years agoMerge "Make a11y node info parceling more robust" into nyc-dev am: ce5c8cb6b8 am...
Phil Weaver [Fri, 7 Apr 2017 23:39:58 +0000 (23:39 +0000)]
Merge "Make a11y node info parceling more robust" into nyc-dev am: ce5c8cb6b8 am: 3241198caa am: 9ff56373ff
am: 8ebb1df537

Change-Id: Idcb33dc49c7f93ebbac86c7f8d99c33ecb296cdf

7 years agoMake a11y node info parceling more robust am: 1d8eb49073 am: 93c47c9d07 am: 3a7cf1f05...
Phil Weaver [Fri, 7 Apr 2017 23:36:29 +0000 (23:36 +0000)]
Make a11y node info parceling more robust am: 1d8eb49073 am: 93c47c9d07 am: 3a7cf1f057  -s ours
am: d3a4f4a33c

Change-Id: I2c1d0fb08ed990e4deb03361dddb1075d1ac7fad

7 years agoMake a11y node info parceling more robust am: d0e54c1c09 am: d87b12a4df am: a0f874d5c...
Phil Weaver [Fri, 7 Apr 2017 23:32:32 +0000 (23:32 +0000)]
Make a11y node info parceling more robust am: d0e54c1c09 am: d87b12a4df am: a0f874d5c1 am: c30868369c am: 4c898e40ef am: b35d6eadf3 am: 576768a022
am: 78aa850127

Change-Id: Ib44e1d477230767f5e03f63cb96a342a4bd929fb

7 years agoMerge "Make a11y node info parceling more robust" into nyc-dev am: ce5c8cb6b8 am...
Phil Weaver [Fri, 7 Apr 2017 23:32:28 +0000 (23:32 +0000)]
Merge "Make a11y node info parceling more robust" into nyc-dev am: ce5c8cb6b8 am: 3241198caa
am: 9ff56373ff

Change-Id: I53855b4dc3bba60226751fdaaaa722636c226486

7 years agoMake a11y node info parceling more robust am: 1d8eb49073 am: 93c47c9d07
Phil Weaver [Fri, 7 Apr 2017 23:30:19 +0000 (23:30 +0000)]
Make a11y node info parceling more robust am: 1d8eb49073 am: 93c47c9d07
am: 3a7cf1f057  -s ours

Change-Id: I0000c6df3ca0375022535be19cf0f9a76ed07e39

7 years agoMerge "Make a11y node info parceling more robust" into nyc-dev am: ce5c8cb6b8
Phil Weaver [Fri, 7 Apr 2017 23:25:03 +0000 (23:25 +0000)]
Merge "Make a11y node info parceling more robust" into nyc-dev am: ce5c8cb6b8
am: 3241198caa

Change-Id: I370bd8804cd24fb3b67160da1e76084abce525cf

7 years agoMake a11y node info parceling more robust am: d0e54c1c09 am: d87b12a4df am: a0f874d5c...
Phil Weaver [Fri, 7 Apr 2017 23:24:59 +0000 (23:24 +0000)]
Make a11y node info parceling more robust am: d0e54c1c09 am: d87b12a4df am: a0f874d5c1 am: c30868369c am: 4c898e40ef am: b35d6eadf3
am: 576768a022

Change-Id: If36bfc0a6ec317b6d46a0de7fe24a8be38ef59c7

7 years agoMake a11y node info parceling more robust am: d0e54c1c09 am: d87b12a4df am: a0f874d5c...
Phil Weaver [Fri, 7 Apr 2017 23:17:08 +0000 (23:17 +0000)]
Make a11y node info parceling more robust am: d0e54c1c09 am: d87b12a4df am: a0f874d5c1 am: c30868369c am: 4c898e40ef
am: b35d6eadf3

Change-Id: I460b2e5df5cc1946eec4e9366e22c5de188642c9

7 years agoMerge "Make a11y node info parceling more robust" into nyc-dev
Phil Weaver [Fri, 7 Apr 2017 23:17:02 +0000 (23:17 +0000)]
Merge "Make a11y node info parceling more robust" into nyc-dev
am: ce5c8cb6b8

Change-Id: I6cd7aa39d267bbecbbed54f564dc90b520fe5773

7 years agoMake a11y node info parceling more robust am: 1d8eb49073
Phil Weaver [Fri, 7 Apr 2017 23:16:55 +0000 (23:16 +0000)]
Make a11y node info parceling more robust am: 1d8eb49073
am: 93c47c9d07

Change-Id: I8677c77968c202c8c6a0553db919610a140fda58

7 years agoMerge "Make a11y node info parceling more robust" into nyc-dev
Phil Weaver [Fri, 7 Apr 2017 23:10:27 +0000 (23:10 +0000)]
Merge "Make a11y node info parceling more robust" into nyc-dev

7 years agoMake a11y node info parceling more robust am: d0e54c1c09 am: d87b12a4df am: a0f874d5c...
Phil Weaver [Fri, 7 Apr 2017 23:09:35 +0000 (23:09 +0000)]
Make a11y node info parceling more robust am: d0e54c1c09 am: d87b12a4df am: a0f874d5c1 am: c30868369c
am: 4c898e40ef

Change-Id: Icdb456c12bf0e0d3675ab15fa0b82b482ff4ddeb

7 years agoMake a11y node info parceling more robust
Phil Weaver [Fri, 7 Apr 2017 23:09:28 +0000 (23:09 +0000)]
Make a11y node info parceling more robust
am: 1d8eb49073

Change-Id: I5280a23cbfff5abfcc83e9e6d9afb4f8960ece44

7 years agoMake a11y node info parceling more robust am: d0e54c1c09 am: d87b12a4df am: a0f874d5c1
Phil Weaver [Fri, 7 Apr 2017 23:02:10 +0000 (23:02 +0000)]
Make a11y node info parceling more robust am: d0e54c1c09 am: d87b12a4df am: a0f874d5c1
am: c30868369c

Change-Id: If1cfc920db5aea27397a8f79125db944d5c4580b

7 years agoMake a11y node info parceling more robust am: d0e54c1c09 am: d87b12a4df
Phil Weaver [Fri, 7 Apr 2017 22:53:58 +0000 (22:53 +0000)]
Make a11y node info parceling more robust am: d0e54c1c09 am: d87b12a4df
am: a0f874d5c1

Change-Id: I2bc5c091c1c685da2be951e4294483519481789f

7 years agoMake a11y node info parceling more robust am: d0e54c1c09
Phil Weaver [Fri, 7 Apr 2017 22:46:31 +0000 (22:46 +0000)]
Make a11y node info parceling more robust am: d0e54c1c09
am: d87b12a4df

Change-Id: Ic10324338024f86cfc64b3e01c6380b26334d5a3

7 years agoMake a11y node info parceling more robust
Phil Weaver [Fri, 7 Apr 2017 22:39:22 +0000 (22:39 +0000)]
Make a11y node info parceling more robust
am: d0e54c1c09

Change-Id: Ie4c34b84540bc928859ef1c271b4eb9d520fa6bc

7 years agoMake a11y node info parceling more robust
Phil Weaver [Fri, 7 Apr 2017 21:39:27 +0000 (14:39 -0700)]
Make a11y node info parceling more robust

Fix a bug where a malformed Parceled representation
of an AccessibilityNodeInfo could be used to mess with
Bundles as they get reparceled.

Bug: 36491278
Test: Verified that POC no longer works, a11y cts still passes.

(Manual merge from commit 687bb44b437f7bb24dd3dddf072c2f646308e2ca)

Change-Id: I7746c9175a2da28f75d4f4b169d7997abadf1852

7 years agoMake a11y node info parceling more robust
Phil Weaver [Fri, 7 Apr 2017 00:40:51 +0000 (17:40 -0700)]
Make a11y node info parceling more robust

Fix a bug where a malformed Parceled representation
of an AccessibilityNodeInfo could be used to mess with
Bundles as they get reparceled.

Bug: 36491278
Test: Verified that POC no longer works, a11y cts still passes.
Change-Id: I10f24747e3ab87d77cd1deba56db4526e3aa5441
(cherry picked from commit 687bb44b437f7bb24dd3dddf072c2f646308e2ca)

7 years agoMake a11y node info parceling more robust
Phil Weaver [Fri, 7 Apr 2017 00:40:51 +0000 (17:40 -0700)]
Make a11y node info parceling more robust

Fix a bug where a malformed Parceled representation
of an AccessibilityNodeInfo could be used to mess with
Bundles as they get reparceled.

Bug: 36491278
Test: Verified that POC no longer works, a11y cts still passes.
Change-Id: I10f24747e3ab87d77cd1deba56db4526e3aa5441
(cherry picked from commit 687bb44b437f7bb24dd3dddf072c2f646308e2ca)

7 years agoMake a11y node info parceling more robust
Phil Weaver [Fri, 7 Apr 2017 00:40:51 +0000 (17:40 -0700)]
Make a11y node info parceling more robust

Fix a bug where a malformed Parceled representation
of an AccessibilityNodeInfo could be used to mess with
Bundles as they get reparceled.

Bug: 36491278
Test: Verified that POC no longer works, a11y cts still passes.
Change-Id: I10f24747e3ab87d77cd1deba56db4526e3aa5441
(cherry picked from commit 687bb44b437f7bb24dd3dddf072c2f646308e2ca)

7 years agoDocument Android Wear usage of KEYCODE_WINDOW.
Julius D'souza [Thu, 6 Apr 2017 14:12:46 +0000 (14:12 +0000)]
Document Android Wear usage of KEYCODE_WINDOW.
am: 03d4a65865

Change-Id: If938e79a9eddcf3cec97274ad305834c2d58386e

7 years agoDocument Android Wear usage of KEYCODE_WINDOW.
Julius D'souza [Mon, 3 Apr 2017 17:16:51 +0000 (10:16 -0700)]
Document Android Wear usage of KEYCODE_WINDOW.

Bug: 36779123
Change-Id: I17ea8c13d91bd3d8125413cc0c4a7881d0f289e8

7 years agoCorrects CompactExtractEditLayout to account for systemWindowInsetBottom
Mark Renouf [Fri, 31 Mar 2017 15:15:49 +0000 (15:15 +0000)]
Corrects CompactExtractEditLayout to account for systemWindowInsetBottom
am: d1a0d19794

Change-Id: Ia0bdc13ac2e8f3e65aaa38a64b4af9409ffeaa21

7 years agoCorrects CompactExtractEditLayout to account for systemWindowInsetBottom
Mark Renouf [Wed, 29 Mar 2017 20:08:21 +0000 (16:08 -0400)]
Corrects CompactExtractEditLayout to account for systemWindowInsetBottom

Percentage-base sizes involving screen height are incorrect for watch
devices with non 1:1 display metrics. These are round screens with an
inactive bottom portion. To maintain the correct proportions the
bottom inset must be added to the height.

BUG: 36728475
Change-Id: Ibe351d1db7964b4b89ce9a588c171cd8407e2a50

7 years agodocs: Removing Android dev docs from Gerrit am: ecf817682a
Andrew Solovay [Fri, 24 Mar 2017 18:12:20 +0000 (18:12 +0000)]
docs: Removing Android dev docs from Gerrit am: ecf817682a
am: d4fdb6e3b2

Change-Id: I5fe711e6596afacc4bb363224dcb78057abd99c2

7 years agodocs: Removing Android dev docs from Gerrit
Andrew Solovay [Fri, 24 Mar 2017 18:03:12 +0000 (18:03 +0000)]
docs: Removing Android dev docs from Gerrit
am: ecf817682a

Change-Id: I0bcc2c8d0b63e73d88187c19ef4addeaed2bfdf0

7 years agoMerge "DO NOT MERGE: Add state machine model for skipping initial brightness ramps...
Julius D'souza [Thu, 23 Mar 2017 23:27:56 +0000 (23:27 +0000)]
Merge "DO NOT MERGE: Add state machine model for skipping initial brightness ramps." into cw-f-dev
am: e07e8ac99a  -s ours

Change-Id: I65724f0fa8bb9763484f2766c061310d6da06918

7 years agoMerge "DO NOT MERGE: Add state machine model for skipping initial brightness ramps...
Julius D'souza [Thu, 23 Mar 2017 23:15:41 +0000 (23:15 +0000)]
Merge "DO NOT MERGE: Add state machine model for skipping initial brightness ramps." into cw-f-dev

7 years agoMerge "Remove bg_non_interactive cgroup [ DO NOT MERGE ]" into nyc-mr2-dev
Wei Wang [Thu, 23 Mar 2017 21:18:45 +0000 (21:18 +0000)]
Merge "Remove bg_non_interactive cgroup [ DO NOT MERGE ]" into nyc-mr2-dev

7 years agoDO NOT MERGE: Add state machine model for skipping initial brightness ramps.
Julius D'souza [Wed, 22 Mar 2017 18:55:58 +0000 (11:55 -0700)]
DO NOT MERGE: Add state machine model for skipping initial brightness ramps.

Bug: 36092576

Change-Id: Ic403ab587c3f4cb707e8316c6107461bf0748a1c

7 years agodocs: Removing Android dev docs from Gerrit
Andrew Solovay [Thu, 9 Mar 2017 01:38:01 +0000 (17:38 -0800)]
docs: Removing Android dev docs from Gerrit

Android developer docs are now maintained in Piper, go/dac-source

Removing all files from Gerrit, since these files can cause build
errors if they refer to classes that are later removed (whence
bug b/35849713 ).

Gerrit already has readme files in these directories telling people
docs are not maintained here; these readmes will be a lot easier to
spot now.

Ran a doc build with these files deleted, and it seems to work fine,
so submitting this CL *shouldn't* break anything.

Merged to master to resolve conflict.
Merged-In: Ic74c3f97f9620daf23543930a8b7ed1386f4d172

Bug: 35849713
Change-Id: I5331cdc968be817ff70ba32dd03fce76493a6ab8

7 years agoRemove bg_non_interactive cgroup [ DO NOT MERGE ]
Wei Wang [Mon, 20 Mar 2017 23:13:40 +0000 (16:13 -0700)]
Remove bg_non_interactive cgroup [ DO NOT MERGE ]

Bug: 34193533
Test: mma
Change-Id: I0d255f47eaded15eda02a4654193a4e49c63a2c5

7 years agoRemove the now-empty WearBluetoothService from SystemServer
Calvin On [Tue, 21 Mar 2017 20:18:59 +0000 (20:18 +0000)]
Remove the now-empty WearBluetoothService from SystemServer
am: 3bcc688bce

Change-Id: Id95770faa65878282d9b49c01fad258b8eb57c06

7 years agoRemove the now-empty WearBluetoothService from SystemServer
Calvin On [Fri, 17 Mar 2017 21:19:29 +0000 (14:19 -0700)]
Remove the now-empty WearBluetoothService from SystemServer

Change-Id: I7ddf213fa90acf84a50a53e7666311132b6b3922

7 years agoMerge "Fix NPE in LockSettingsService." into cw-f-dev
Andrew Zeng [Thu, 16 Mar 2017 23:22:05 +0000 (23:22 +0000)]
Merge "Fix NPE in LockSettingsService." into cw-f-dev
am: 4aff3d53ef

Change-Id: I17880622c489df79eeea5116b3afe3c462b06554

7 years agoMerge "Fix NPE in LockSettingsService." into cw-f-dev
Andrew Zeng [Thu, 16 Mar 2017 23:03:02 +0000 (23:03 +0000)]
Merge "Fix NPE in LockSettingsService." into cw-f-dev

7 years agoFix NPE in LockSettingsService.
Andrew Zeng [Fri, 10 Mar 2017 23:14:08 +0000 (15:14 -0800)]
Fix NPE in LockSettingsService.

Bug: 33789922

Change-Id: Iecdedd8d73d9f749f15a64131cc894d9f92de9d1

7 years agoMerge commit 'faf40708836c34936932c67f47ed39ef4b85de03' into manual_merge_faf40708836...
Marie Janssen [Tue, 14 Mar 2017 19:29:50 +0000 (19:29 +0000)]
Merge commit 'faf40708836c34936932c67f47ed39ef4b85de03' into manual_merge_faf40708836c am: 4034a9a96a am: 89d2b46a4a
am: c1a5939026

Change-Id: I50df57c208542d35bc72851fa37e47731bbd9965

7 years agoMerge commit 'faf40708836c34936932c67f47ed39ef4b85de03' into manual_merge_faf40708836...
Marie Janssen [Tue, 14 Mar 2017 19:21:49 +0000 (19:21 +0000)]
Merge commit 'faf40708836c34936932c67f47ed39ef4b85de03' into manual_merge_faf40708836c am: 4034a9a96a
am: 89d2b46a4a

Change-Id: I5f710900167558283cb9e898c2022d8991dbb5c3

7 years agoMerge commit 'faf40708836c34936932c67f47ed39ef4b85de03' into manual_merge_faf40708836c
Marie Janssen [Tue, 14 Mar 2017 19:16:47 +0000 (19:16 +0000)]
Merge commit 'faf40708836c34936932c67f47ed39ef4b85de03' into manual_merge_faf40708836c
am: 4034a9a96a

Change-Id: Ie63f9d24ab37c5465b250d2b9b60efdf736b4d60

7 years agoMerge commit 'faf40708836c34936932c67f47ed39ef4b85de03' into manual_merge_faf40708836c
Marie Janssen [Tue, 14 Mar 2017 17:09:52 +0000 (10:09 -0700)]
Merge commit 'faf40708836c34936932c67f47ed39ef4b85de03' into manual_merge_faf40708836c

Change-Id: I2b9aeca138aefb0579b3be8014b3f0bf49d99764

7 years agoMerge "Protect Bluetooth OPP ACCEPT and DECLINE broadcast" into nyc-dev
Marie Janssen [Tue, 14 Mar 2017 16:01:07 +0000 (16:01 +0000)]
Merge "Protect Bluetooth OPP ACCEPT and DECLINE broadcast" into nyc-dev

7 years agoMerge "DO NOT MERGE Clear calling identity before checking if user is running." into...
Kenny Guy [Tue, 14 Mar 2017 12:21:00 +0000 (12:21 +0000)]
Merge "DO NOT MERGE Clear calling identity before checking if user is running." into nyc-dev am: 2df7f9f9c0 am: c5d86736d3 am: 00b77edec0
am: 11c5ff0399

Change-Id: I649c06ea01b23db5668fa0694528cffd823b8d7b

7 years agoMerge "DO NOT MERGE Clear calling identity before checking if user is running." into...
Kenny Guy [Tue, 14 Mar 2017 12:16:23 +0000 (12:16 +0000)]
Merge "DO NOT MERGE Clear calling identity before checking if user is running." into nyc-dev am: 2df7f9f9c0 am: c5d86736d3
am: 00b77edec0

Change-Id: I16ea6b1c11cde1b9491826d7e95dc9bf3a45458b

7 years agoMerge "DO NOT MERGE Clear calling identity before checking if user is running." into...
Kenny Guy [Tue, 14 Mar 2017 12:11:54 +0000 (12:11 +0000)]
Merge "DO NOT MERGE Clear calling identity before checking if user is running." into nyc-dev am: 2df7f9f9c0
am: c5d86736d3

Change-Id: I0886d46f74fec980eb8bd6c99d8b647e294bcb21

7 years agoMerge "DO NOT MERGE Clear calling identity before checking if user is running." into...
Kenny Guy [Tue, 14 Mar 2017 12:07:26 +0000 (12:07 +0000)]
Merge "DO NOT MERGE Clear calling identity before checking if user is running." into nyc-dev
am: 2df7f9f9c0

Change-Id: I9ca23aa395e0120413a60174e9b7ef44d91a90b1

7 years agoMerge "DO NOT MERGE Clear calling identity before checking if user is running." into...
Kenny Guy [Tue, 14 Mar 2017 12:01:54 +0000 (12:01 +0000)]
Merge "DO NOT MERGE Clear calling identity before checking if user is running." into nyc-dev

7 years agoMerge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am...
Fyodor Kupolov [Fri, 10 Mar 2017 04:12:42 +0000 (04:12 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am: ac87aee354 am: a821245d70 am: 156fa32e2a  -s ours am: de9cb7ed68  -s ours am: 2c112c4ad2 am: 2411b4f774  -s ours am: aa0b718886 am: 9e2cf8e5c4 am: f937aabb0f am: f7cde31747  -s ours am: 1fd70c201a am: ff5be765b1 am: 6ca67f067a
am: e385c8a0b9

Change-Id: I013ae3547aa049a19aae6840e9e80a4a361527e3

7 years agoMerge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am...
Fyodor Kupolov [Fri, 10 Mar 2017 04:04:01 +0000 (04:04 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am: ac87aee354 am: a821245d70 am: 156fa32e2a  -s ours am: de9cb7ed68  -s ours am: 2c112c4ad2 am: 2411b4f774  -s ours am: aa0b718886 am: 9e2cf8e5c4 am: f937aabb0f am: f7cde31747  -s ours am: 1fd70c201a am: ff5be765b1
am: 6ca67f067a

Change-Id: Ibd38a2b0bd180180bb3812dedaf22ab07000aee9

7 years agoMerge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am...
Fyodor Kupolov [Fri, 10 Mar 2017 03:58:02 +0000 (03:58 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am: ac87aee354 am: a821245d70 am: 156fa32e2a  -s ours am: de9cb7ed68  -s ours am: 2c112c4ad2 am: 2411b4f774  -s ours am: aa0b718886 am: 9e2cf8e5c4 am: f937aabb0f am: f7cde31747  -s ours am: 1fd70c201a
am: ff5be765b1

Change-Id: I4fb68c79924a046a065f893b14877fb6d6e21632

7 years agoMerge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am...
Fyodor Kupolov [Fri, 10 Mar 2017 03:48:47 +0000 (03:48 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am: ac87aee354 am: a821245d70 am: 156fa32e2a  -s ours am: de9cb7ed68  -s ours am: 2c112c4ad2 am: 2411b4f774  -s ours am: aa0b718886 am: 9e2cf8e5c4 am: f937aabb0f am: f7cde31747  -s ours
am: 1fd70c201a

Change-Id: Ia89d648b7b9042781c41a8bb0ffa7a125b3f36d1

7 years agoMerge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am...
Fyodor Kupolov [Fri, 10 Mar 2017 03:40:12 +0000 (03:40 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am: ac87aee354 am: a821245d70 am: 156fa32e2a  -s ours am: de9cb7ed68  -s ours am: 2c112c4ad2 am: 2411b4f774  -s ours am: aa0b718886 am: 9e2cf8e5c4 am: f937aabb0f
am: f7cde31747  -s ours

Change-Id: I801cd8c8e607f2c88edb26ea1947e650f128df4d

7 years agoMerge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am...
Fyodor Kupolov [Fri, 10 Mar 2017 03:34:38 +0000 (03:34 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am: ac87aee354 am: a821245d70 am: 156fa32e2a  -s ours am: de9cb7ed68  -s ours am: 2c112c4ad2 am: 2411b4f774  -s ours am: aa0b718886 am: 9e2cf8e5c4
am: f937aabb0f

Change-Id: I6c0bf6190e96b34b6995337a94c451b4b172c168

7 years agoMerge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am...
Fyodor Kupolov [Fri, 10 Mar 2017 03:28:56 +0000 (03:28 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am: ac87aee354 am: a821245d70 am: 156fa32e2a  -s ours am: de9cb7ed68  -s ours am: 2c112c4ad2 am: 2411b4f774  -s ours am: aa0b718886
am: 9e2cf8e5c4

Change-Id: I4d447f67d293a1cc4a187d66496cb447612eebad

7 years agoMerge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am...
Fyodor Kupolov [Fri, 10 Mar 2017 03:23:34 +0000 (03:23 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am: ac87aee354 am: a821245d70 am: 156fa32e2a  -s ours am: de9cb7ed68  -s ours am: 2c112c4ad2 am: 2411b4f774  -s ours
am: aa0b718886

Change-Id: Ife44fe3b8b295901699de0043dba5bcdc06f32f3

7 years agoMerge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-dev am...
Fyodor Kupolov [Fri, 10 Mar 2017 03:20:10 +0000 (03:20 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-dev am: d2e8e1488a  -s ours am: 1e6d3f904e am: ce677737ec  -s ours am: b76704bf25 am: ad386addb9 am: bbb7ae05d4 am: 1aaef53444  -s ours am: 9c4d89c55f am: a1aa5cb34a am: e3e01cc375
am: 6ce5879e11

Change-Id: Id25ccb2ef13e266090c5759e34dee8b93175402d

7 years agoMerge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am...
Fyodor Kupolov [Fri, 10 Mar 2017 03:17:46 +0000 (03:17 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am: ac87aee354 am: a821245d70 am: 156fa32e2a  -s ours am: de9cb7ed68  -s ours am: 2c112c4ad2
am: 2411b4f774  -s ours

Change-Id: Ie78ad1a602d6502c09a98ee9e28119caab3534b7

7 years ago[DO NOT MERGE] Throw exception if slot has invalid offset am: 69e347f7ef -s ours...
Fyodor Kupolov [Fri, 10 Mar 2017 03:15:52 +0000 (03:15 +0000)]
[DO NOT MERGE] Throw exception if slot has invalid offset am: 69e347f7ef  -s ours am: 1c732801ab am: 78861ad53e  -s ours am: 13df27e68b am: a3912b6a1b am: 0766ba70c0 am: 46dbe6a7d0  -s ours am: 567e742daf am: 5a16e06272 am: 73ceabb948
am: e2aeaa9998

Change-Id: I4b07cb2d90fc1af523a3b91817f18ec1e99100fc

7 years agoMerge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am...
Fyodor Kupolov [Fri, 10 Mar 2017 03:12:06 +0000 (03:12 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am: ac87aee354 am: a821245d70 am: 156fa32e2a  -s ours am: de9cb7ed68  -s ours
am: 2c112c4ad2

Change-Id: Ic108a0750248d001873de33d69984e6cf2c3584a

7 years agoMerge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-dev am...
Fyodor Kupolov [Fri, 10 Mar 2017 03:11:33 +0000 (03:11 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-dev am: d2e8e1488a  -s ours am: 1e6d3f904e am: ce677737ec  -s ours am: b76704bf25 am: ad386addb9 am: bbb7ae05d4 am: 1aaef53444  -s ours am: 9c4d89c55f am: a1aa5cb34a
am: e3e01cc375

Change-Id: Ied0957306478565b83e6717659753ed53042248b

7 years ago[DO NOT MERGE] Throw exception if slot has invalid offset am: 69e347f7ef -s ours...
Fyodor Kupolov [Fri, 10 Mar 2017 03:07:21 +0000 (03:07 +0000)]
[DO NOT MERGE] Throw exception if slot has invalid offset am: 69e347f7ef  -s ours am: 1c732801ab am: 78861ad53e  -s ours am: 13df27e68b am: a3912b6a1b am: 0766ba70c0 am: 46dbe6a7d0  -s ours am: 567e742daf am: 5a16e06272
am: 73ceabb948

Change-Id: I3b68d137a93d8d35c08878b486924c6c0e824327

7 years agoMerge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am...
Fyodor Kupolov [Fri, 10 Mar 2017 03:06:31 +0000 (03:06 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am: ac87aee354 am: a821245d70 am: 156fa32e2a  -s ours
am: de9cb7ed68  -s ours

Change-Id: I2f94e2ea49c05a29308ca2351a083377350bb2ab

7 years agoMerge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-dev am...
Fyodor Kupolov [Fri, 10 Mar 2017 03:03:03 +0000 (03:03 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-dev am: d2e8e1488a  -s ours am: 1e6d3f904e am: ce677737ec  -s ours am: b76704bf25 am: ad386addb9 am: bbb7ae05d4 am: 1aaef53444  -s ours am: 9c4d89c55f
am: a1aa5cb34a

Change-Id: Idb8e058c25dc0f9fe9a1de880a6cb4f052a8729d

7 years agoMerge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am...
Fyodor Kupolov [Fri, 10 Mar 2017 03:00:46 +0000 (03:00 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am: ac87aee354 am: a821245d70
am: 156fa32e2a  -s ours

Change-Id: Ic4e51daa36c395f2e3b538658649ff9104bb962c

7 years ago[DO NOT MERGE] Throw exception if slot has invalid offset am: 69e347f7ef -s ours...
Fyodor Kupolov [Fri, 10 Mar 2017 02:59:41 +0000 (02:59 +0000)]
[DO NOT MERGE] Throw exception if slot has invalid offset am: 69e347f7ef  -s ours am: 1c732801ab am: 78861ad53e  -s ours am: 13df27e68b am: a3912b6a1b am: 0766ba70c0 am: 46dbe6a7d0  -s ours am: 567e742daf
am: 5a16e06272

Change-Id: I314400073f43d720f74eac2e8f744b3768537f49

7 years agoMerge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-dev am...
Fyodor Kupolov [Fri, 10 Mar 2017 02:55:29 +0000 (02:55 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-dev am: d2e8e1488a  -s ours am: 1e6d3f904e am: ce677737ec  -s ours am: b76704bf25 am: ad386addb9 am: bbb7ae05d4 am: 1aaef53444  -s ours
am: 9c4d89c55f

Change-Id: Ief6c78fd5c3d281eae14928bd5572e0042cbc684

7 years agoMerge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am...
Fyodor Kupolov [Fri, 10 Mar 2017 02:55:07 +0000 (02:55 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am: ac87aee354
am: a821245d70

Change-Id: I1e47c963728906cb2283a353c882017368d07747

7 years agoMerge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-mr1-dev...
Fyodor Kupolov [Fri, 10 Mar 2017 02:54:01 +0000 (02:54 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-mr1-dev am: e1766acb41 am: 105b0ff30c  -s ours am: 677a8879c0 am: 360cb87db4 am: 109ac1c0b6 am: 48a36cdade  -s ours am: e8fb34b44c am: c4054a8b7f am: 885acaff75
am: 4d1253afcc

Change-Id: I3e6bbbe56d17b61e31cfb673ac198ba5b4825992

7 years ago[DO NOT MERGE] Throw exception if slot has invalid offset am: 69e347f7ef -s ours...
Fyodor Kupolov [Fri, 10 Mar 2017 02:50:38 +0000 (02:50 +0000)]
[DO NOT MERGE] Throw exception if slot has invalid offset am: 69e347f7ef  -s ours am: 1c732801ab am: 78861ad53e  -s ours am: 13df27e68b am: a3912b6a1b am: 0766ba70c0 am: 46dbe6a7d0  -s ours
am: 567e742daf

Change-Id: Iad3060ad58e0276c5125a54915f35e01eaa5babe

7 years agoMerge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev
Fyodor Kupolov [Fri, 10 Mar 2017 02:49:34 +0000 (02:49 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev
am: ac87aee354

Change-Id: I5bbdc48120f2d03b4ad6605bfeccd5ccdc8c7958

7 years agoMerge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-dev am...
Fyodor Kupolov [Fri, 10 Mar 2017 02:45:57 +0000 (02:45 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-dev am: d2e8e1488a  -s ours am: 1e6d3f904e am: ce677737ec  -s ours am: b76704bf25 am: ad386addb9 am: bbb7ae05d4
am: 1aaef53444  -s ours

Change-Id: I9a962db0db6c1e5369bc3e21b4b2f1c6a21dc2c6

7 years agoMerge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-mr1-dev...
Fyodor Kupolov [Fri, 10 Mar 2017 02:45:14 +0000 (02:45 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-mr1-dev am: e1766acb41 am: 105b0ff30c  -s ours am: 677a8879c0 am: 360cb87db4 am: 109ac1c0b6 am: 48a36cdade  -s ours am: e8fb34b44c am: c4054a8b7f
am: 885acaff75

Change-Id: Ib675821a67fad6caf4875fa0de2a88b1f8c0ede1

7 years ago[DO NOT MERGE] Throw exception if slot has invalid offset am: 69e347f7ef -s ours...
Fyodor Kupolov [Fri, 10 Mar 2017 02:42:23 +0000 (02:42 +0000)]
[DO NOT MERGE] Throw exception if slot has invalid offset am: 69e347f7ef  -s ours am: 1c732801ab am: 78861ad53e  -s ours am: 13df27e68b am: a3912b6a1b am: 0766ba70c0
am: 46dbe6a7d0  -s ours

Change-Id: I23d0261d2b1704528a4ea49c59785c9e35419d2b

7 years agoMerge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev
Fyodor Kupolov [Fri, 10 Mar 2017 02:39:09 +0000 (02:39 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev

7 years agoMerge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-mr1-dev...
Fyodor Kupolov [Fri, 10 Mar 2017 02:39:11 +0000 (02:39 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-mr1-dev am: e1766acb41 am: 105b0ff30c  -s ours am: 677a8879c0 am: 360cb87db4 am: 109ac1c0b6 am: 48a36cdade  -s ours am: e8fb34b44c
am: c4054a8b7f

Change-Id: I6834bf86950b8e6889515fcf52e930301c99ca57

7 years agoMerge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-dev am...
Fyodor Kupolov [Fri, 10 Mar 2017 02:37:52 +0000 (02:37 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-dev am: d2e8e1488a  -s ours am: 1e6d3f904e am: ce677737ec  -s ours am: b76704bf25 am: ad386addb9
am: bbb7ae05d4

Change-Id: Ia30782857bdbb6e05bc1e2b0e7c5d905509e2c5d

7 years agoMerge "[DO NOT MERGE] Throw exception if slot has invalid offset" into mnc-dev am...
Fyodor Kupolov [Fri, 10 Mar 2017 02:37:06 +0000 (02:37 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into mnc-dev am: d2699d009b am: 4130501c19 am: 3a8534f18e am: a74748d05e  -s ours am: dd472080f0 am: 221088d6df am: cc484a5cdf
am: b091206f92

Change-Id: Ib889b5c4a2ae00618295f0a664a215429352ac57

7 years ago[DO NOT MERGE] Throw exception if slot has invalid offset am: 69e347f7ef -s ours...
Fyodor Kupolov [Fri, 10 Mar 2017 02:34:06 +0000 (02:34 +0000)]
[DO NOT MERGE] Throw exception if slot has invalid offset am: 69e347f7ef  -s ours am: 1c732801ab am: 78861ad53e  -s ours am: 13df27e68b am: a3912b6a1b
am: 0766ba70c0

Change-Id: Iccf8ecd9b0a5571efe648416ffda156578aeb095

7 years agoMerge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-mr1-dev...
Fyodor Kupolov [Fri, 10 Mar 2017 02:33:18 +0000 (02:33 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-mr1-dev am: e1766acb41 am: 105b0ff30c  -s ours am: 677a8879c0 am: 360cb87db4 am: 109ac1c0b6 am: 48a36cdade  -s ours
am: e8fb34b44c

Change-Id: I1aead2d88b2af119492a62134c1b416792218227

7 years agoMerge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-dev am...
Fyodor Kupolov [Fri, 10 Mar 2017 02:30:29 +0000 (02:30 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-dev am: d2e8e1488a  -s ours am: 1e6d3f904e am: ce677737ec  -s ours am: b76704bf25
am: ad386addb9

Change-Id: I80e715d7dc65b82d89249b163c2198e5c0561761

7 years agoMerge "[DO NOT MERGE] Throw exception if slot has invalid offset" into mnc-dev am...
Fyodor Kupolov [Fri, 10 Mar 2017 02:28:19 +0000 (02:28 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into mnc-dev am: d2699d009b am: 4130501c19 am: 3a8534f18e am: a74748d05e  -s ours am: dd472080f0 am: 221088d6df
am: cc484a5cdf

Change-Id: Ib8f83621d7fa7ad2626602838892f672129a562a

7 years ago[DO NOT MERGE] Throw exception if slot has invalid offset am: 69e347f7ef -s ours...
Fyodor Kupolov [Fri, 10 Mar 2017 02:25:30 +0000 (02:25 +0000)]
[DO NOT MERGE] Throw exception if slot has invalid offset am: 69e347f7ef  -s ours am: 1c732801ab am: 78861ad53e  -s ours am: 13df27e68b
am: a3912b6a1b

Change-Id: I48d59519ecc404860100e8aba1cb118e1d141ca0

7 years agoMerge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-mr1-dev...
Fyodor Kupolov [Fri, 10 Mar 2017 02:25:14 +0000 (02:25 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-mr1-dev am: e1766acb41 am: 105b0ff30c  -s ours am: 677a8879c0 am: 360cb87db4 am: 109ac1c0b6
am: 48a36cdade  -s ours

Change-Id: I7cf97386f135d2814da0c7b33d7d80372b2bbaf2

7 years agoMerge "[DO NOT MERGE] Throw exception if slot has invalid offset" into mnc-dev am...
Fyodor Kupolov [Fri, 10 Mar 2017 02:22:43 +0000 (02:22 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into mnc-dev am: d2699d009b am: 4130501c19 am: 3a8534f18e am: a74748d05e  -s ours am: dd472080f0
am: 221088d6df

Change-Id: I2b47df993ec31f20618b0372995176d9bb38c0f7

7 years agoMerge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-dev am...
Fyodor Kupolov [Fri, 10 Mar 2017 02:21:44 +0000 (02:21 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-dev am: d2e8e1488a  -s ours am: 1e6d3f904e am: ce677737ec  -s ours
am: b76704bf25

Change-Id: I4dfd0be0c7ab642e3d743062da218950a4b4129f

7 years agoMerge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-mr1-dev...
Fyodor Kupolov [Fri, 10 Mar 2017 02:19:06 +0000 (02:19 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-mr1-dev am: e1766acb41 am: 105b0ff30c  -s ours am: 677a8879c0 am: 360cb87db4
am: 109ac1c0b6

Change-Id: I07162b0fa7bbe2423d122f64dec9f43fde4aaad8

7 years ago[DO NOT MERGE] Throw exception if slot has invalid offset am: 69e347f7ef -s ours...
Fyodor Kupolov [Fri, 10 Mar 2017 02:18:04 +0000 (02:18 +0000)]
[DO NOT MERGE] Throw exception if slot has invalid offset am: 69e347f7ef  -s ours am: 1c732801ab am: 78861ad53e  -s ours
am: 13df27e68b

Change-Id: I7b7c03f9b744957378aef17f26ac4a66f9c747e3

7 years agoMerge "[DO NOT MERGE] Throw exception if slot has invalid offset" into mnc-dev am...
Fyodor Kupolov [Fri, 10 Mar 2017 02:16:27 +0000 (02:16 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into mnc-dev am: d2699d009b am: 4130501c19 am: 3a8534f18e am: a74748d05e  -s ours
am: dd472080f0

Change-Id: Ic8f642fbbe53a0861550121cfcab0e4576c9e755

7 years agoMerge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-dev am...
Fyodor Kupolov [Fri, 10 Mar 2017 02:14:07 +0000 (02:14 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-dev am: d2e8e1488a  -s ours am: 1e6d3f904e
am: ce677737ec  -s ours

Change-Id: I4ef50e6ff43d354f1542a0c1bb486ebfe14309e8

7 years agoMerge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-mr1-dev...
Fyodor Kupolov [Fri, 10 Mar 2017 02:13:55 +0000 (02:13 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-mr1-dev am: e1766acb41 am: 105b0ff30c  -s ours am: 677a8879c0
am: 360cb87db4

Change-Id: I424fd036c097317c6f7fae26ea8a46e3f35a1af9

7 years agoMerge "[DO NOT MERGE] Throw exception if slot has invalid offset" into mnc-dev am...
Fyodor Kupolov [Fri, 10 Mar 2017 02:11:03 +0000 (02:11 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into mnc-dev am: d2699d009b am: 4130501c19 am: 3a8534f18e
am: a74748d05e  -s ours

Change-Id: Icb0b081e77e58761c4c3a9baea0254aa16151f2f

7 years ago[DO NOT MERGE] Throw exception if slot has invalid offset am: 69e347f7ef -s ours...
Fyodor Kupolov [Fri, 10 Mar 2017 02:10:31 +0000 (02:10 +0000)]
[DO NOT MERGE] Throw exception if slot has invalid offset am: 69e347f7ef  -s ours am: 1c732801ab
am: 78861ad53e  -s ours

Change-Id: I32668e97f69f63e798cab1e62f68deae861ec96e