OSDN Git Service

android-x86/frameworks-base.git
6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1...
Beverly Tai [Thu, 19 Oct 2017 23:37:21 +0000 (23:37 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am: f2b592726d  -s ours am: dfbaa1fd8b am: d7ece4da2c am: 06bd19c1fb am: 7b1157a92e  -s ours am: bcdb9079ef am: 5fda53b294 am: 791d8a5b16
am: 4dd01948c1

Change-Id: I7426cd9b8f68f80a924662b4870558974bad347b

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1...
Beverly Tai [Thu, 19 Oct 2017 23:11:55 +0000 (23:11 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am: f2b592726d  -s ours am: dfbaa1fd8b am: d7ece4da2c am: 06bd19c1fb am: 7b1157a92e  -s ours am: bcdb9079ef am: 5fda53b294
am: 791d8a5b16

Change-Id: I0678613fd0293afeafa38c4ac9fb0a55fb4b3969

6 years agoClearing up invalid entries when SyncStorageEngine starts am: 271702fc28 am: 8b438236...
Suprabh Shukla [Thu, 19 Oct 2017 23:09:02 +0000 (23:09 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am: 271702fc28 am: 8b438236ce  -s ours am: 159648d6e5 am: 6f0e6952ef am: 8fb52c8d06 am: cf8fe172a1 am: 55ffaea04b am: d1150b7e55 am: a4454ba4a9
am: 29257874f9

Change-Id: I3852ef99532b956fd3280c49d6722c2aed1d79a6

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1...
Beverly Tai [Thu, 19 Oct 2017 22:56:23 +0000 (22:56 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am: f2b592726d  -s ours am: dfbaa1fd8b am: d7ece4da2c am: 06bd19c1fb am: 7b1157a92e  -s ours am: bcdb9079ef
am: 5fda53b294

Change-Id: Idda35731b13787fb00e0c7474eebc5b7d8660251

6 years agoClearing up invalid entries when SyncStorageEngine starts am: 271702fc28 am: 8b438236...
Suprabh Shukla [Thu, 19 Oct 2017 22:54:42 +0000 (22:54 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am: 271702fc28 am: 8b438236ce  -s ours am: 159648d6e5 am: 6f0e6952ef am: 8fb52c8d06 am: cf8fe172a1 am: 55ffaea04b am: d1150b7e55
am: a4454ba4a9

Change-Id: Ie24e5fc3ab442ca5c51ca79687d417ae563d631c

6 years agoClearing up invalid entries when SyncStorageEngine starts am: 271702fc28 am: 8b438236...
Suprabh Shukla [Thu, 19 Oct 2017 22:40:05 +0000 (22:40 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am: 271702fc28 am: 8b438236ce  -s ours am: 159648d6e5 am: 6f0e6952ef am: 8fb52c8d06 am: cf8fe172a1 am: 55ffaea04b
am: d1150b7e55

Change-Id: Iac842a9f018f24c905d4e165362f5bf87470d296

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1...
Beverly Tai [Thu, 19 Oct 2017 22:39:14 +0000 (22:39 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am: f2b592726d  -s ours am: dfbaa1fd8b am: d7ece4da2c am: 06bd19c1fb am: 7b1157a92e  -s ours
am: bcdb9079ef

Change-Id: Id065bc6f31814aed56fce0ddd9a1b6378d9364ee

6 years agoClearing up invalid entries when SyncStorageEngine starts am: 271702fc28 am: 8b438236...
Suprabh Shukla [Thu, 19 Oct 2017 22:25:04 +0000 (22:25 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am: 271702fc28 am: 8b438236ce  -s ours am: 159648d6e5 am: 6f0e6952ef am: 8fb52c8d06 am: cf8fe172a1
am: 55ffaea04b

Change-Id: I10a7a16d5463e4cbf7880b1979541ea82a56ddd3

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1...
Beverly Tai [Thu, 19 Oct 2017 22:20:11 +0000 (22:20 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am: f2b592726d  -s ours am: dfbaa1fd8b am: d7ece4da2c am: 06bd19c1fb
am: 7b1157a92e  -s ours

Change-Id: I0e451cfd8bf662d959ace4f79b1181d27fce79e1

6 years agoClearing up invalid entries when SyncStorageEngine starts am: 271702fc28 am: 8b438236...
Suprabh Shukla [Thu, 19 Oct 2017 22:06:31 +0000 (22:06 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am: 271702fc28 am: 8b438236ce  -s ours am: 159648d6e5 am: 6f0e6952ef am: 8fb52c8d06
am: cf8fe172a1

Change-Id: I8600883ef4cad6f8b11fc005fc9cfd62d84aeb08

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1...
Beverly Tai [Thu, 19 Oct 2017 22:06:02 +0000 (22:06 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am: f2b592726d  -s ours am: dfbaa1fd8b am: d7ece4da2c
am: 06bd19c1fb

Change-Id: I6f6cb9cf71ba1584b162d6b18c28c2825323e7be

6 years agoClearing up invalid entries when SyncStorageEngine starts am: 271702fc28 am: 8b438236...
Suprabh Shukla [Thu, 19 Oct 2017 21:55:31 +0000 (21:55 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am: 271702fc28 am: 8b438236ce  -s ours am: 159648d6e5 am: 6f0e6952ef
am: 8fb52c8d06

Change-Id: I2d8cdac51baf7b8df6b903f0416e525e9ec44784

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1...
Beverly Tai [Thu, 19 Oct 2017 21:50:59 +0000 (21:50 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am: f2b592726d  -s ours am: dfbaa1fd8b
am: d7ece4da2c

Change-Id: Icfd3af47bed5a40d23d1a48ecbb654625898ca2f

6 years agoClearing up invalid entries when SyncStorageEngine starts am: 271702fc28 am: 8b438236...
Suprabh Shukla [Thu, 19 Oct 2017 21:41:08 +0000 (21:41 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am: 271702fc28 am: 8b438236ce  -s ours am: 159648d6e5
am: 6f0e6952ef

Change-Id: Ie4cf94614784c4938776c8c6c37fff64e6cfa240

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1...
Beverly Tai [Thu, 19 Oct 2017 21:35:03 +0000 (21:35 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am: f2b592726d  -s ours
am: dfbaa1fd8b

Change-Id: I3bcc1adb52f00e95ef31dc17fc29b2e0242bc753

6 years agoClearing up invalid entries when SyncStorageEngine starts am: 271702fc28 am: 8b438236...
Suprabh Shukla [Thu, 19 Oct 2017 21:25:06 +0000 (21:25 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am: 271702fc28 am: 8b438236ce  -s ours
am: 159648d6e5

Change-Id: I34260f4fd841084a9e91b89905d84004efb40b23

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev
Beverly Tai [Thu, 19 Oct 2017 21:18:55 +0000 (21:18 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev
am: f2b592726d  -s ours

Change-Id: Idd1243bb1cddc91f34f6e47e9cea88b72cff29d0

6 years agoClearing up invalid entries when SyncStorageEngine starts am: 271702fc28
Suprabh Shukla [Thu, 19 Oct 2017 20:57:26 +0000 (20:57 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am: 271702fc28
am: 8b438236ce  -s ours

Change-Id: Ib8c3a4e6e8e39e42aa640c9988d0dd2022f486ec

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev...
Beverly Tai [Thu, 19 Oct 2017 02:59:41 +0000 (02:59 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev am: e1adf2240f  -s ours am: 3ca0cc0ae6  -s ours am: 01ae445966 am: 3d600ede6d am: d34366e714 am: 9b0a6a3509  -s ours am: f1a95220a3 am: c6ca9254ed am: 7fd4bec14a
am: b00fd6bb97

Change-Id: Ie1ed5edaabe4cf6206764c0f343a70eb588009c5

6 years agoMerge "Prevent getting data from Clipboard if device is locked" into lmp-dev am:...
Siyamed Sinir [Thu, 19 Oct 2017 02:49:27 +0000 (02:49 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into lmp-dev am: 9f496fbbe0 am: 4973227cbf  -s ours am: dcdb0e6bbe am: b24023a7e0 am: c26e04b006 am: 2bab19f9aa am: 69cc90b01c am: 19a3c53841 am: 9950579eb5
am: 8621a28b04

Change-Id: Ifac3ab83e23f93d8f0834029b44ec8f32bbab243

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev...
Beverly Tai [Thu, 19 Oct 2017 02:48:23 +0000 (02:48 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev am: e1adf2240f  -s ours am: 3ca0cc0ae6  -s ours am: 01ae445966 am: 3d600ede6d am: d34366e714 am: 9b0a6a3509  -s ours am: f1a95220a3 am: c6ca9254ed
am: 7fd4bec14a

Change-Id: Iadf94c4dcda9ae3e7a068838de87a4fadc18be7f

6 years agoMerge "Prevent getting data from Clipboard if device is locked" into lmp-dev am:...
Siyamed Sinir [Thu, 19 Oct 2017 02:37:50 +0000 (02:37 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into lmp-dev am: 9f496fbbe0 am: 4973227cbf  -s ours am: dcdb0e6bbe am: b24023a7e0 am: c26e04b006 am: 2bab19f9aa am: 69cc90b01c am: 19a3c53841
am: 9950579eb5

Change-Id: I9019cab591a3729592ddd142867f6b3f0c40c369

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev...
Beverly Tai [Thu, 19 Oct 2017 02:37:19 +0000 (02:37 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev am: e1adf2240f  -s ours am: 3ca0cc0ae6  -s ours am: 01ae445966 am: 3d600ede6d am: d34366e714 am: 9b0a6a3509  -s ours am: f1a95220a3
am: c6ca9254ed

Change-Id: I8715d787f890827442c098b7ef5c93c563e4246e

6 years agoMerge "Prevent getting data from Clipboard if device is locked" into lmp-dev am:...
Siyamed Sinir [Thu, 19 Oct 2017 02:26:01 +0000 (02:26 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into lmp-dev am: 9f496fbbe0 am: 4973227cbf  -s ours am: dcdb0e6bbe am: b24023a7e0 am: c26e04b006 am: 2bab19f9aa am: 69cc90b01c
am: 19a3c53841

Change-Id: I20e8fba8fe69c10c5cbdd1a1d3db27a20a206e51

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev...
Beverly Tai [Thu, 19 Oct 2017 02:25:35 +0000 (02:25 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev am: e1adf2240f  -s ours am: 3ca0cc0ae6  -s ours am: 01ae445966 am: 3d600ede6d am: d34366e714 am: 9b0a6a3509  -s ours
am: f1a95220a3

Change-Id: Icccff07eedee53fdc20c40d62e41b40af0b4992f

6 years agoMerge "Prevent getting data from Clipboard if device is locked" into lmp-dev am:...
Siyamed Sinir [Thu, 19 Oct 2017 02:12:01 +0000 (02:12 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into lmp-dev am: 9f496fbbe0 am: 4973227cbf  -s ours am: dcdb0e6bbe am: b24023a7e0 am: c26e04b006 am: 2bab19f9aa
am: 69cc90b01c

Change-Id: Ia0630be45dfa4778b204585002c299c847d32366

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev...
Beverly Tai [Thu, 19 Oct 2017 02:09:14 +0000 (02:09 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev am: e1adf2240f  -s ours am: 3ca0cc0ae6  -s ours am: 01ae445966 am: 3d600ede6d am: d34366e714
am: 9b0a6a3509  -s ours

Change-Id: I8a0b0468b053f31a5e28b335cfdd68d7adf7e4b5

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev...
Beverly Tai [Thu, 19 Oct 2017 02:03:19 +0000 (02:03 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev am: e1adf2240f  -s ours am: 3ca0cc0ae6  -s ours am: 01ae445966 am: 3d600ede6d
am: d34366e714

Change-Id: I1574e30ff64f6c7a691e8f4e1e4110cb0af9ee81

6 years agoMerge "Prevent getting data from Clipboard if device is locked" into lmp-dev am:...
Siyamed Sinir [Thu, 19 Oct 2017 01:58:22 +0000 (01:58 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into lmp-dev am: 9f496fbbe0 am: 4973227cbf  -s ours am: dcdb0e6bbe am: b24023a7e0 am: c26e04b006
am: 2bab19f9aa

Change-Id: I3ee3147762e5ad8d72f4478d87800a35639228e0

6 years agoMerge "Prevent getting data from Clipboard if device is locked" into lmp-dev am:...
Siyamed Sinir [Thu, 19 Oct 2017 01:49:20 +0000 (01:49 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into lmp-dev am: 9f496fbbe0 am: 4973227cbf  -s ours am: dcdb0e6bbe am: b24023a7e0
am: c26e04b006

Change-Id: Iade150e6e33a8ac095941e55c5871215bf54fe2d

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev...
Beverly Tai [Thu, 19 Oct 2017 01:48:33 +0000 (01:48 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev am: e1adf2240f  -s ours am: 3ca0cc0ae6  -s ours am: 01ae445966
am: 3d600ede6d

Change-Id: Ibc39fe483882017cbd47733259bd04eb30b187f3

6 years agoMerge "Prevent getting data from Clipboard if device is locked" into lmp-dev am:...
Siyamed Sinir [Thu, 19 Oct 2017 01:39:57 +0000 (01:39 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into lmp-dev am: 9f496fbbe0 am: 4973227cbf  -s ours am: dcdb0e6bbe
am: b24023a7e0

Change-Id: If0f97db33c9f48c13c5f97c313807e8aab25a16b

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev...
Beverly Tai [Thu, 19 Oct 2017 01:38:56 +0000 (01:38 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev am: e1adf2240f  -s ours am: 3ca0cc0ae6  -s ours
am: 01ae445966

Change-Id: Ia2dff6ee69c4c7f10413aa98ba17ca717cb492d2

6 years agoRevert "Clearing up invalid entries when SyncStorageEngine starts" am: 4a9d358448...
Suprabh Shukla [Thu, 19 Oct 2017 01:30:27 +0000 (01:30 +0000)]
Revert "Clearing up invalid entries when SyncStorageEngine starts" am: 4a9d358448 am: 0597a93629  -s ours am: d2455f8fa2 am: 2d194e5958 am: 57bbf9bb9c am: cf16ef09da am: f0d00e51ba am: 4e61bdb7d3 am: d1e7db9f4a
am: 9ecbe6f6e7

Change-Id: I6c55e7667d23c638f16bd4bd5c62f9f706542154

6 years agoMerge "Prevent getting data from Clipboard if device is locked" into lmp-dev am:...
Siyamed Sinir [Thu, 19 Oct 2017 01:30:16 +0000 (01:30 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into lmp-dev am: 9f496fbbe0 am: 4973227cbf  -s ours
am: dcdb0e6bbe

Change-Id: I245194dbfd5da9eb5f5d13977b12b5dde39c1bb2

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev...
Beverly Tai [Thu, 19 Oct 2017 01:23:57 +0000 (01:23 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev am: e1adf2240f  -s ours
am: 3ca0cc0ae6  -s ours

Change-Id: Id5662a7d789e3e17e365d99b439cc8e8ab5d1c37

6 years agoMerge "Prevent getting data from Clipboard if device is locked" into lmp-dev am:...
Siyamed Sinir [Thu, 19 Oct 2017 01:20:25 +0000 (01:20 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into lmp-dev am: 9f496fbbe0
am: 4973227cbf  -s ours

Change-Id: I9f53bf5a896885860e204764a8a282f77eff50cd

6 years agoRevert "Clearing up invalid entries when SyncStorageEngine starts" am: 4a9d358448...
Suprabh Shukla [Thu, 19 Oct 2017 01:18:27 +0000 (01:18 +0000)]
Revert "Clearing up invalid entries when SyncStorageEngine starts" am: 4a9d358448 am: 0597a93629  -s ours am: d2455f8fa2 am: 2d194e5958 am: 57bbf9bb9c am: cf16ef09da am: f0d00e51ba am: 4e61bdb7d3
am: d1e7db9f4a

Change-Id: Ia7824e38f4b5d92d09577e30a20a72bdf513534f

6 years agoRevert "Clearing up invalid entries when SyncStorageEngine starts" am: 4a9d358448...
Suprabh Shukla [Thu, 19 Oct 2017 01:07:40 +0000 (01:07 +0000)]
Revert "Clearing up invalid entries when SyncStorageEngine starts" am: 4a9d358448 am: 0597a93629  -s ours am: d2455f8fa2 am: 2d194e5958 am: 57bbf9bb9c am: cf16ef09da am: f0d00e51ba
am: 4e61bdb7d3

Change-Id: I6baddf0fcdcdd5a1236f69f5b19c67aa1e35b3c2

6 years agoRevert "Clearing up invalid entries when SyncStorageEngine starts" am: 4a9d358448...
Suprabh Shukla [Thu, 19 Oct 2017 00:57:00 +0000 (00:57 +0000)]
Revert "Clearing up invalid entries when SyncStorageEngine starts" am: 4a9d358448 am: 0597a93629  -s ours am: d2455f8fa2 am: 2d194e5958 am: 57bbf9bb9c am: cf16ef09da
am: f0d00e51ba

Change-Id: I4e775fd5b0c2ad74e92ef84ac1b1e2f307d6b54e

6 years agoRevert "Clearing up invalid entries when SyncStorageEngine starts" am: 4a9d358448...
Suprabh Shukla [Thu, 19 Oct 2017 00:47:30 +0000 (00:47 +0000)]
Revert "Clearing up invalid entries when SyncStorageEngine starts" am: 4a9d358448 am: 0597a93629  -s ours am: d2455f8fa2 am: 2d194e5958 am: 57bbf9bb9c
am: cf16ef09da

Change-Id: I82ed951a2f528dab65b95332db48a865b3fe9296

6 years agoRevert "Clearing up invalid entries when SyncStorageEngine starts" am: 4a9d358448...
Suprabh Shukla [Thu, 19 Oct 2017 00:37:28 +0000 (00:37 +0000)]
Revert "Clearing up invalid entries when SyncStorageEngine starts" am: 4a9d358448 am: 0597a93629  -s ours am: d2455f8fa2 am: 2d194e5958
am: 57bbf9bb9c

Change-Id: Ia3f528efeaca69830c1a858e6c4637690c70062a

6 years agoRevert "Clearing up invalid entries when SyncStorageEngine starts" am: 4a9d358448...
Suprabh Shukla [Thu, 19 Oct 2017 00:28:13 +0000 (00:28 +0000)]
Revert "Clearing up invalid entries when SyncStorageEngine starts" am: 4a9d358448 am: 0597a93629  -s ours am: d2455f8fa2
am: 2d194e5958

Change-Id: I669966eb694623fe3052db84dd1dc6375e1bfde9

6 years agoRevert "Clearing up invalid entries when SyncStorageEngine starts" am: 4a9d358448...
Suprabh Shukla [Thu, 19 Oct 2017 00:18:17 +0000 (00:18 +0000)]
Revert "Clearing up invalid entries when SyncStorageEngine starts" am: 4a9d358448 am: 0597a93629  -s ours
am: d2455f8fa2

Change-Id: I20c7da32465a525b0a0bcd21f862a0a49cf727cb

6 years agoRevert "Clearing up invalid entries when SyncStorageEngine starts" am: 4a9d358448
Suprabh Shukla [Thu, 19 Oct 2017 00:07:54 +0000 (00:07 +0000)]
Revert "Clearing up invalid entries when SyncStorageEngine starts" am: 4a9d358448
am: 0597a93629  -s ours

Change-Id: I08d261935eb00ae8e8a929ff9ab54f6ec48fac88

6 years agoClearing up invalid entries when SyncStorageEngine starts am: 89c0dbca0f am: 53a2e460...
Suprabh Shukla [Wed, 18 Oct 2017 20:19:08 +0000 (20:19 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am: 89c0dbca0f am: 53a2e46036  -s ours am: 5bd2c48ac0  -s ours am: 54cbf03ecb  -s ours am: 88f4c765a6  -s ours am: 62dbcc9af0  -s ours am: 17f0e4bc00  -s ours am: f0f1b1fe9e  -s ours am: 9913314caf  -s ours
am: 28a1dd26e8  -s ours

Change-Id: If444060396d2b80c4073ac2c9fd2c4dcb1129590

6 years agoClearing up invalid entries when SyncStorageEngine starts am: 89c0dbca0f am: 53a2e460...
Suprabh Shukla [Wed, 18 Oct 2017 20:05:12 +0000 (20:05 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am: 89c0dbca0f am: 53a2e46036  -s ours am: 5bd2c48ac0  -s ours am: 54cbf03ecb  -s ours am: 88f4c765a6  -s ours am: 62dbcc9af0  -s ours am: 17f0e4bc00  -s ours am: f0f1b1fe9e  -s ours
am: 9913314caf  -s ours

Change-Id: I5acc3db78fd84503b35aaa61539b1c6922e64465

6 years agoClearing up invalid entries when SyncStorageEngine starts am: 89c0dbca0f am: 53a2e460...
Suprabh Shukla [Wed, 18 Oct 2017 19:43:57 +0000 (19:43 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am: 89c0dbca0f am: 53a2e46036  -s ours am: 5bd2c48ac0  -s ours am: 54cbf03ecb  -s ours am: 88f4c765a6  -s ours am: 62dbcc9af0  -s ours am: 17f0e4bc00  -s ours
am: f0f1b1fe9e  -s ours

Change-Id: I8ecb93fa4fa973ea6ee4694e1cd458b353a44bac

6 years agoClearing up invalid entries when SyncStorageEngine starts am: 89c0dbca0f am: 53a2e460...
Suprabh Shukla [Wed, 18 Oct 2017 19:17:53 +0000 (19:17 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am: 89c0dbca0f am: 53a2e46036  -s ours am: 5bd2c48ac0  -s ours am: 54cbf03ecb  -s ours am: 88f4c765a6  -s ours am: 62dbcc9af0  -s ours
am: 17f0e4bc00  -s ours

Change-Id: I6dafcb8d51f40d157c2d6efbb41012d19c7eb1d2

6 years agoClearing up invalid entries when SyncStorageEngine starts am: 89c0dbca0f am: 53a2e460...
Suprabh Shukla [Wed, 18 Oct 2017 19:05:08 +0000 (19:05 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am: 89c0dbca0f am: 53a2e46036  -s ours am: 5bd2c48ac0  -s ours am: 54cbf03ecb  -s ours am: 88f4c765a6  -s ours
am: 62dbcc9af0  -s ours

Change-Id: Ica4728bb090b2653d47308848ef8f771154879ca

6 years agoClearing up invalid entries when SyncStorageEngine starts am: 89c0dbca0f am: 53a2e460...
Suprabh Shukla [Wed, 18 Oct 2017 18:51:00 +0000 (18:51 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am: 89c0dbca0f am: 53a2e46036  -s ours am: 5bd2c48ac0  -s ours am: 54cbf03ecb  -s ours
am: 88f4c765a6  -s ours

Change-Id: Ia620503c958f9b1b2f44f2e99ba47d36bb558e0f

6 years agoClearing up invalid entries when SyncStorageEngine starts am: 89c0dbca0f am: 53a2e460...
Suprabh Shukla [Wed, 18 Oct 2017 18:36:52 +0000 (18:36 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am: 89c0dbca0f am: 53a2e46036  -s ours am: 5bd2c48ac0  -s ours
am: 54cbf03ecb  -s ours

Change-Id: I500740d20bb4ee1b9cdb2de29387377e02be5872

6 years agoClearing up invalid entries when SyncStorageEngine starts am: 89c0dbca0f am: 53a2e460...
Suprabh Shukla [Wed, 18 Oct 2017 18:19:39 +0000 (18:19 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am: 89c0dbca0f am: 53a2e46036  -s ours
am: 5bd2c48ac0  -s ours

Change-Id: Ib09d2326565a43d3ff0c4d0a88041703658a8804

6 years agoClearing up invalid entries when SyncStorageEngine starts am: 89c0dbca0f
Suprabh Shukla [Wed, 18 Oct 2017 18:04:15 +0000 (18:04 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am: 89c0dbca0f
am: 53a2e46036  -s ours

Change-Id: Ic0fa17750a252a75912c4a2da73d45ff9a9fea1d

6 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 16 Oct 2017 05:41:21 +0000 (05:41 +0000)]
Import translations. DO NOT MERGE
am: b081f1e809  -s ours

Change-Id: I8589e76f2f5197beefddb2027261e290932d268f

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 15 Oct 2017 20:13:44 +0000 (13:13 -0700)]
Import translations. DO NOT MERGE

Change-Id: Id17cd2d22442f7bf1221be8f98164189757695a4
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

6 years agoDO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 am: 7555eb508c...
Jeff Sharkey [Wed, 11 Oct 2017 22:27:31 +0000 (22:27 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 am: 7555eb508c am: 5d60a49d63 am: 8916c30c54  -s ours am: ba1f2d2571 am: 300e6ffafb am: f1f2a61fb7
am: 92d80b72aa

Change-Id: I872a35e35cf8a997108daad39447bbad36ccfcaf

6 years agoDO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 04b96d76a9 am: d20cad62ee...
Jeff Sharkey [Wed, 11 Oct 2017 22:12:39 +0000 (22:12 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 04b96d76a9 am: d20cad62ee am: e62d479921  -s ours am: e9d2113af7 am: 8860624853 am: 7512875224
am: 44adace6c6

Change-Id: I3d0c489f0a6b3522f93b6d3b4db7892d081dc11c

6 years agoDO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 am: 7555eb508c...
Jeff Sharkey [Wed, 11 Oct 2017 22:11:57 +0000 (22:11 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 am: 7555eb508c am: 5d60a49d63 am: 8916c30c54  -s ours am: ba1f2d2571 am: 300e6ffafb
am: f1f2a61fb7

Change-Id: Ib999a03b6b52d8ca7446b1db6450578bab50d5d9

6 years agoDO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 04b96d76a9 am: d20cad62ee...
Jeff Sharkey [Wed, 11 Oct 2017 22:00:35 +0000 (22:00 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 04b96d76a9 am: d20cad62ee am: e62d479921  -s ours am: e9d2113af7 am: 8860624853
am: 7512875224

Change-Id: I55e255c4089089403a327cb0e24f750b5b9975ec

6 years agoDO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 am: 7555eb508c...
Jeff Sharkey [Wed, 11 Oct 2017 21:51:37 +0000 (21:51 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 am: 7555eb508c am: 5d60a49d63 am: 8916c30c54  -s ours am: ba1f2d2571
am: 300e6ffafb

Change-Id: Iaef9ffa2cdfd6cf424fa22e554df3a0ea4d3e41f

6 years agoDO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 04b96d76a9 am: d20cad62ee...
Jeff Sharkey [Wed, 11 Oct 2017 21:41:50 +0000 (21:41 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 04b96d76a9 am: d20cad62ee am: e62d479921  -s ours am: e9d2113af7
am: 8860624853

Change-Id: Iea7736cd9e60673296bd39377393fa785bd58b17

6 years agoDO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 am: 7555eb508c...
Jeff Sharkey [Wed, 11 Oct 2017 21:34:52 +0000 (21:34 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 am: 7555eb508c am: 5d60a49d63 am: 8916c30c54  -s ours
am: ba1f2d2571

Change-Id: Ie72b8e52cd8717ac87d90627c1f53cbe2261c5e5

6 years agoMerge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 254369...
Jeff Sharkey [Wed, 11 Oct 2017 21:24:41 +0000 (21:24 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 254369967a am: 4a60106aa0 am: 72df97053c
am: da3d10591a

Change-Id: I22ddd0fb81ca1acdb070a5872b4c0a31e197e15b

6 years agoDO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 04b96d76a9 am: d20cad62ee...
Jeff Sharkey [Wed, 11 Oct 2017 21:24:00 +0000 (21:24 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 04b96d76a9 am: d20cad62ee am: e62d479921  -s ours
am: e9d2113af7

Change-Id: Id1d09fd582e8a213f49e215af708291dfc76bb78

6 years agoDO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 am: 7555eb508c...
Jeff Sharkey [Wed, 11 Oct 2017 21:20:52 +0000 (21:20 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 am: 7555eb508c am: 5d60a49d63
am: 8916c30c54  -s ours

Change-Id: Ia94b157d80bec5c24616af67c19bbceb0c384c36

6 years agoMerge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 254369...
Jeff Sharkey [Wed, 11 Oct 2017 21:12:09 +0000 (21:12 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 254369967a am: 4a60106aa0
am: 72df97053c

Change-Id: I62e502ebc6ac642cac7165ce1ce0982675362ab3

6 years agoDO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 04b96d76a9 am: d20cad62ee
Jeff Sharkey [Wed, 11 Oct 2017 20:59:51 +0000 (20:59 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 04b96d76a9 am: d20cad62ee
am: e62d479921  -s ours

Change-Id: I1bc814da2ad8f108189d7f2293bf373b04434257

6 years agoDO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 am: 7555eb508c
Jeff Sharkey [Wed, 11 Oct 2017 20:58:32 +0000 (20:58 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 am: 7555eb508c
am: 5d60a49d63

Change-Id: I1b0f66ccf915436637a804ff0517c431b2813ec8

6 years agoMerge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 254369967a
Jeff Sharkey [Wed, 11 Oct 2017 20:47:31 +0000 (20:47 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 254369967a
am: 4a60106aa0

Change-Id: Iaace5d103229b9028d1b81602107af35857ca55c

6 years agoMerge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am...
Jeff Sharkey [Wed, 11 Oct 2017 20:47:31 +0000 (20:47 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am: 9d3706046c
am: b4d23d55c2

Change-Id: Idfcdf295be77c9ab39d790e7793d2d772c92f9f7

6 years agoDO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 04b96d76a9
Jeff Sharkey [Wed, 11 Oct 2017 20:44:45 +0000 (20:44 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 04b96d76a9
am: d20cad62ee

Change-Id: Iaee355315a29be72ffd670178f88510aacdfc042

6 years agoDO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9
Jeff Sharkey [Wed, 11 Oct 2017 20:42:42 +0000 (20:42 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9
am: 7555eb508c

Change-Id: Ida6bf3d99469b443d6312066497ddb067569cd1d

6 years agoMerge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev
Jeff Sharkey [Wed, 11 Oct 2017 20:34:50 +0000 (20:34 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev
am: 9d3706046c

Change-Id: I46ef6e731af52bd7404e580f85611804abb8bcef

6 years agoMerge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev
Jeff Sharkey [Wed, 11 Oct 2017 20:34:48 +0000 (20:34 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev
am: 254369967a

Change-Id: I511e6d122a5717b36ad78d8100ed728ef862adff

6 years agoDO NOT MERGE. KEY_INTENT shouldn't grant permissions.
Jeff Sharkey [Wed, 11 Oct 2017 20:32:40 +0000 (20:32 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions.
am: 04b96d76a9

Change-Id: Ie2ae7f5071a534e1245c92293014963c8e4187ca

6 years agoDO NOT MERGE. KEY_INTENT shouldn't grant permissions.
Jeff Sharkey [Wed, 11 Oct 2017 20:31:35 +0000 (20:31 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions.
am: d87d2746a9

Change-Id: Ia5455efc69556e5a52b1cc945e99b2ef51fdcd23

6 years agoMerge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev
TreeHugger Robot [Wed, 11 Oct 2017 20:23:53 +0000 (20:23 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev

6 years agoMerge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev
TreeHugger Robot [Wed, 11 Oct 2017 20:23:33 +0000 (20:23 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev

6 years agoMerge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev
TreeHugger Robot [Wed, 11 Oct 2017 20:22:22 +0000 (20:22 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 11 Oct 2017 19:20:06 +0000 (19:20 +0000)]
Import translations. DO NOT MERGE
am: 757057a5b5  -s ours

Change-Id: I35b629a43daf6ef991fc4ec61a4aba933cad0ae2

6 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 10 Oct 2017 22:31:12 +0000 (15:31 -0700)]
Import translations. DO NOT MERGE

Change-Id: I4d38b1392fb97117f7a403a224fc65a871dcea19
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 8 Oct 2017 14:00:50 +0000 (14:00 +0000)]
Import translations. DO NOT MERGE
am: 80d87da085  -s ours

Change-Id: I7b560ea83669c408725cf2e7d6e1a7c3d7eb191f

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 8 Oct 2017 04:49:36 +0000 (21:49 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ibfe6303b4d78d1ac0c8a0dbb235c6be683504018
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

6 years agoMerge "Stop explicitly using kCallerPasses_Ownership" into nyc-dev am: cfe2352d88...
Leon Scroggins III [Fri, 6 Oct 2017 16:53:46 +0000 (16:53 +0000)]
Merge "Stop explicitly using kCallerPasses_Ownership" into nyc-dev am: cfe2352d88 am: 2399d935bc am: f32424b90d
am: 54c2cbb0f9

Change-Id: Iae83cebe615d0df3a6f2c6bdee6f8002d3ae82b0

6 years agoMerge "Stop explicitly using kCallerPasses_Ownership" into nyc-dev am: cfe2352d88...
Leon Scroggins III [Fri, 6 Oct 2017 16:32:10 +0000 (16:32 +0000)]
Merge "Stop explicitly using kCallerPasses_Ownership" into nyc-dev am: cfe2352d88 am: 2399d935bc
am: f32424b90d

Change-Id: I405bee24b11319430e3490f3299d9c8b6438e407

6 years agoMerge "Stop explicitly using kCallerPasses_Ownership" into nyc-dev am: cfe2352d88
Leon Scroggins III [Fri, 6 Oct 2017 16:18:49 +0000 (16:18 +0000)]
Merge "Stop explicitly using kCallerPasses_Ownership" into nyc-dev am: cfe2352d88
am: 2399d935bc

Change-Id: Ib219c4c5299b681b6f3858cb67c70a7fd9110f20

6 years agoMerge "Stop explicitly using kCallerPasses_Ownership" into nyc-dev
Leon Scroggins III [Fri, 6 Oct 2017 16:06:34 +0000 (16:06 +0000)]
Merge "Stop explicitly using kCallerPasses_Ownership" into nyc-dev
am: cfe2352d88

Change-Id: Id7d59d95e8f5dfa68f7ff55ca5729a11a1fdf1d0

6 years agoMerge "Stop explicitly using kCallerPasses_Ownership" into nyc-dev
TreeHugger Robot [Fri, 6 Oct 2017 15:45:37 +0000 (15:45 +0000)]
Merge "Stop explicitly using kCallerPasses_Ownership" into nyc-dev

6 years agoDO NOT MERGE. KEY_INTENT shouldn't grant permissions.
Jeff Sharkey [Mon, 12 Jun 2017 23:33:07 +0000 (17:33 -0600)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions.

KEY_INTENT has no business granting any Uri permissions, so remove
any grant flags that malicious apps may have tried sneaking in.

Test: builds, boots
Bug: 3299034132879915
Change-Id: I657455a770c81f045ccce6abbd2291407a1cfb42

6 years agoDO NOT MERGE. KEY_INTENT shouldn't grant permissions.
Jeff Sharkey [Mon, 12 Jun 2017 23:33:07 +0000 (17:33 -0600)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions.

KEY_INTENT has no business granting any Uri permissions, so remove
any grant flags that malicious apps may have tried sneaking in.

Test: builds, boots
Bug: 3299034132879915
Change-Id: I657455a770c81f045ccce6abbd2291407a1cfb42

6 years agoDO NOT MERGE. KEY_INTENT shouldn't grant permissions.
Jeff Sharkey [Mon, 12 Jun 2017 23:33:07 +0000 (17:33 -0600)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions.

KEY_INTENT has no business granting any Uri permissions, so remove
any grant flags that malicious apps may have tried sneaking in.

Test: builds, boots
Bug: 3299034132879915
Change-Id: I657455a770c81f045ccce6abbd2291407a1cfb42

6 years agoDO NOT MERGE. KEY_INTENT shouldn't grant permissions.
Jeff Sharkey [Mon, 12 Jun 2017 23:33:07 +0000 (17:33 -0600)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions.

KEY_INTENT has no business granting any Uri permissions, so remove
any grant flags that malicious apps may have tried sneaking in.

Test: builds, boots
Bug: 3299034132879915
Change-Id: I657455a770c81f045ccce6abbd2291407a1cfb42

6 years agoDO NOT MERGE. KEY_INTENT shouldn't grant permissions.
Jeff Sharkey [Mon, 12 Jun 2017 23:33:07 +0000 (17:33 -0600)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions.

KEY_INTENT has no business granting any Uri permissions, so remove
any grant flags that malicious apps may have tried sneaking in.

Test: builds, boots
Bug: 3299034132879915
Change-Id: I657455a770c81f045ccce6abbd2291407a1cfb42

6 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 2 Oct 2017 16:47:00 +0000 (16:47 +0000)]
Import translations. DO NOT MERGE
am: 45de16dde5  -s ours

Change-Id: Idaa0738ef0b990ef955a0f6c55c7a0905739439a

6 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 2 Oct 2017 04:27:23 +0000 (21:27 -0700)]
Import translations. DO NOT MERGE

Change-Id: I9ca153d375ff59721c164c9841f7c873aaa562fc
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

6 years agoFix ClipboardService device lock check for cross profile am: 6d79675e0c am: 095eda930...
Siyamed Sinir [Sat, 30 Sep 2017 01:15:21 +0000 (01:15 +0000)]
Fix ClipboardService device lock check for cross profile am: 6d79675e0c am: 095eda9307 am: a4f6ca3e77 am: 85439e9114 am: 17735f183a am: d93f91a137 am: 9865205a4e
am: 7c7945c959

Change-Id: I0d4f109c2e73ee7088bb8b77eba563d60ee0113f

6 years agoFix ClipboardService device lock check for cross profile am: 6d79675e0c am: 095eda930...
Siyamed Sinir [Sat, 30 Sep 2017 01:07:30 +0000 (01:07 +0000)]
Fix ClipboardService device lock check for cross profile am: 6d79675e0c am: 095eda9307 am: a4f6ca3e77 am: 85439e9114 am: 17735f183a am: d93f91a137
am: 9865205a4e

Change-Id: I7c34d6b58d5aacadd6efa07ce12f9b7e9898768a

6 years agoFix ClipboardService device lock check for cross profile am: 6d79675e0c am: 095eda930...
Siyamed Sinir [Sat, 30 Sep 2017 00:58:30 +0000 (00:58 +0000)]
Fix ClipboardService device lock check for cross profile am: 6d79675e0c am: 095eda9307 am: a4f6ca3e77 am: 85439e9114 am: 17735f183a
am: d93f91a137

Change-Id: If4bb2848e0df71257a1f7e162524ebd08a5dad4d

6 years agoFix ClipboardService device lock check for cross profile am: 6d79675e0c am: 095eda930...
Siyamed Sinir [Sat, 30 Sep 2017 00:51:02 +0000 (00:51 +0000)]
Fix ClipboardService device lock check for cross profile am: 6d79675e0c am: 095eda9307 am: a4f6ca3e77 am: 85439e9114
am: 17735f183a

Change-Id: I71795f8f2f454956797ffaa78d22ca3573e5d626