Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
260,019 Commits 3 Branches 0 Tags
07dfa0baae98a4dd67dce4afab388ae239ea42e7
Commit Graph

260019 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Android Build Merger (Role)
07dfa0baae [automerger skipped] Import translations. DO NOT MERGE skipped: 5587649e8f 
Change-Id: I20e457d90615a005e83f7f3c46006a505deee29b
 2018-09-30 12:23:14 +00:00
Bill Yi
5587649e8f Import translations. DO NOT MERGE 
Change-Id: I85f31d6bac9ff093dd6ef9d129126dfc96b92e4e
Auto-generated-cl: translation import
 2018-09-30 05:22:43 -07:00
Atanas Kirilov
b908fd8d07 Merge changes from topic "am-81126cf1-3777-4130-82b2-fbb9b5f9bcf8" into nyc-mr2-dev 
* changes:
  [automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." am: 95a3e91846 am: 94e1a09bc6 am: 84756be0be am: 276f6cbb70
  [automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." am: 95a3e91846 am: 94e1a09bc6 am: 84756be0be
  [automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." am: 95a3e91846 am: 94e1a09bc6
  [automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." am: 95a3e91846
  RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package."
 2018-09-28 23:21:47 +00:00
Atanas Kirilov
e8fea59d6e Merge changes from topic "am-81126cf1-3777-4130-82b2-fbb9b5f9bcf8" into cw-f-dev 
* changes:
  [automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." am: 95a3e91846 am: 94e1a09bc6 am: 84756be0be
  [automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." am: 95a3e91846 am: 94e1a09bc6
  [automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." am: 95a3e91846
  RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package."
 2018-09-28 23:21:47 +00:00
Android Build Merger (Role)
90b8425c0b [automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions." am: 999e3fe986 am: 79c6a599fe am: 446837c874 am: 84b50e6a10 
Change-Id: I2df84d1d165f276b0da0aa58c4945f9a5d89e31f
 2018-09-28 20:34:53 +00:00
Android Build Merger (Role)
84b50e6a10 [automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions." am: 999e3fe986 am: 79c6a599fe am: 446837c874 
Change-Id: I01bfdf7bcc657acf3827aa0b1675adf107562f8a
 2018-09-28 20:34:40 +00:00
Android Build Merger (Role)
446837c874 [automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions." am: 999e3fe986 am: 79c6a599fe 
Change-Id: I094a6ffa8dee70d4f9f45c4f8d9929d92b078cec
 2018-09-28 20:34:28 +00:00
Android Build Merger (Role)
50861d59c2 [automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." am: 95a3e91846 am: 94e1a09bc6 am: 84756be0be am: 276f6cbb70 
Change-Id: If5cdbd2e616e8441fe469950342114c6771d1571
 2018-09-28 20:34:21 +00:00
Android Build Merger (Role)
79c6a599fe [automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions." am: 999e3fe986 
Change-Id: I178b86c62e2b0e8d3399897adaa3bfc191daea2d
 2018-09-28 20:34:21 +00:00
Atanas Kirilov
999e3fe986 RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions." 
This reverts commit 8da6786608.

Reason for revert: Not a security fix and the security fix needs this cl is reverted.
Bug: 114365189

Change-Id: I1826a5b6889f21fbbe16311a3da66c93e26383f3
 2018-09-28 20:34:17 +00:00
Android Build Merger (Role)
276f6cbb70 [automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." am: 95a3e91846 am: 94e1a09bc6 am: 84756be0be 
Change-Id: I83b2b097d30d2ea1fae3361cc06c503d61a444e8
 2018-09-28 20:34:04 +00:00
Android Build Merger (Role)
84756be0be [automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." am: 95a3e91846 am: 94e1a09bc6 
Change-Id: Ie3b9caf9452711a136f50a5ac8aa4946fa0d2767
 2018-09-28 20:33:53 +00:00
Android Build Merger (Role)
94e1a09bc6 [automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." am: 95a3e91846 
Change-Id: Ib9aa56a12fff0fb53848b9856fb89c6bb4de3793
 2018-09-28 20:33:45 +00:00
Atanas Kirilov
95a3e91846 RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." 
This reverts commit fa69d725eb.

Reason for revert: triggers other issue.
Bug: 114365189

Change-Id: I746c74b00f4524575279cdaa831435d12425de20
 2018-09-28 20:33:41 +00:00
TreeHugger Robot
78bacb4061 Merge changes from topic "am-bdb0270e-8295-4ee6-be36-2709e172d48f" into nyc-mr2-dev 
* changes:
  [automerger] Verify number of Map entries written to Parcel am: 057a01d1f3 am: d6947f1cbf am: 628cbe5c53 am: 433e4173ec
  [automerger] Verify number of Map entries written to Parcel am: 057a01d1f3 am: d6947f1cbf am: 628cbe5c53
  [automerger] Verify number of Map entries written to Parcel am: 057a01d1f3 am: d6947f1cbf
  [automerger] Verify number of Map entries written to Parcel am: 057a01d1f3
  Verify number of Map entries written to Parcel
 2018-09-06 01:29:28 +00:00
TreeHugger Robot
218f82342a Merge changes from topic "am-bdb0270e-8295-4ee6-be36-2709e172d48f" into cw-f-dev 
* changes:
  [automerger] Verify number of Map entries written to Parcel am: 057a01d1f3 am: d6947f1cbf am: 628cbe5c53
  [automerger] Verify number of Map entries written to Parcel am: 057a01d1f3 am: d6947f1cbf
  [automerger] Verify number of Map entries written to Parcel am: 057a01d1f3
  Verify number of Map entries written to Parcel
 2018-09-06 01:29:28 +00:00
TreeHugger Robot
28850f8620 Merge changes from topic "am-bdb0270e-8295-4ee6-be36-2709e172d48f" into nyc-mr1-dev 
* changes:
  [automerger] Verify number of Map entries written to Parcel am: 057a01d1f3 am: d6947f1cbf
  [automerger] Verify number of Map entries written to Parcel am: 057a01d1f3
  Verify number of Map entries written to Parcel
 2018-09-06 01:29:28 +00:00
TreeHugger Robot
e58385ab65 Merge changes from topic "am-bdb0270e-8295-4ee6-be36-2709e172d48f" into nyc-dr1-dev 
* changes:
  [automerger] Verify number of Map entries written to Parcel am: 057a01d1f3
  Verify number of Map entries written to Parcel
 2018-09-06 01:29:28 +00:00
TreeHugger Robot
de95cfe1b2 Merge changes from topic "am-51363a78-f167-48aa-956c-f9bfd551a3a5" into nyc-mr2-dev 
* changes:
  [automerger skipped] Hide overlay windows when requesting media projection permission. skipped: 5c3f5a02bd skipped: 3eb97a9bd9 skipped: 50f6c53a1a skipped: defeb8c596
  [automerger skipped] Hide overlay windows when requesting media projection permission. skipped: 5c3f5a02bd skipped: 3eb97a9bd9 skipped: 50f6c53a1a
  [automerger skipped] Hide overlay windows when requesting media projection permission. skipped: 5c3f5a02bd skipped: 3eb97a9bd9
  [automerger skipped] Hide overlay windows when requesting media projection permission. skipped: 5c3f5a02bd
  Hide overlay windows when requesting media projection permission.
 2018-09-05 23:39:21 +00:00
TreeHugger Robot
d3fd3688b0 Merge changes from topic "am-51363a78-f167-48aa-956c-f9bfd551a3a5" into cw-f-dev 
* changes:
  [automerger skipped] Hide overlay windows when requesting media projection permission. skipped: 5c3f5a02bd skipped: 3eb97a9bd9 skipped: 50f6c53a1a
  [automerger skipped] Hide overlay windows when requesting media projection permission. skipped: 5c3f5a02bd skipped: 3eb97a9bd9
  [automerger skipped] Hide overlay windows when requesting media projection permission. skipped: 5c3f5a02bd
  Hide overlay windows when requesting media projection permission.
 2018-09-05 23:39:21 +00:00
TreeHugger Robot
f074e624e6 Merge changes from topic "am-51363a78-f167-48aa-956c-f9bfd551a3a5" into nyc-mr1-dev 
* changes:
  [automerger skipped] Hide overlay windows when requesting media projection permission. skipped: 5c3f5a02bd skipped: 3eb97a9bd9
  [automerger skipped] Hide overlay windows when requesting media projection permission. skipped: 5c3f5a02bd
  Hide overlay windows when requesting media projection permission.
 2018-09-05 23:39:21 +00:00
TreeHugger Robot
6b80718bff Merge changes from topic "am-51363a78-f167-48aa-956c-f9bfd551a3a5" into nyc-dr1-dev 
* changes:
  [automerger skipped] Hide overlay windows when requesting media projection permission. skipped: 5c3f5a02bd
  Hide overlay windows when requesting media projection permission.
 2018-09-05 23:39:21 +00:00
TreeHugger Robot
d044f7cdfb Merge changes from topic "am-bada3a56-09dc-47f9-ba2e-42434cf270e2" into nyc-mr2-dev 
* changes:
  [automerger] RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission. am: 295af36009 am: 7ee280f8b5 am: 3290f3b22e
  [automerger] RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission. am: 295af36009 am: 7ee280f8b5
  [automerger] RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission. am: 295af36009
  RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission.
 2018-09-05 22:24:16 +00:00
TreeHugger Robot
9b9cbfe87f Merge changes from topic "am-bada3a56-09dc-47f9-ba2e-42434cf270e2" into cw-f-dev 
* changes:
  [automerger] RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission. am: 295af36009 am: 7ee280f8b5
  [automerger] RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission. am: 295af36009
  RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission.
 2018-09-05 22:24:16 +00:00
TreeHugger Robot
e4ba1b36d5 Merge changes from topic "am-bada3a56-09dc-47f9-ba2e-42434cf270e2" into nyc-mr1-dev 
* changes:
  [automerger] RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission. am: 295af36009
  RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission.
 2018-09-05 22:24:16 +00:00
TreeHugger Robot
19edfe6e23 Merge "RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission." into nyc-dr1-dev 2018-09-05 22:24:16 +00:00
Android Build Merger (Role)
2e5c1ed2ad [automerger] RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission. am: 295af36009 am: 7ee280f8b5 am: 3290f3b22e 
Change-Id: If7b764f16eaf2bdc7f5327351e74458fad48d250
 2018-09-05 20:39:13 +00:00
Android Build Merger (Role)
3290f3b22e [automerger] RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission. am: 295af36009 am: 7ee280f8b5 
Change-Id: Ic52ca75008a7a428fae62f9e1adc861ec51abc09
 2018-09-05 20:39:05 +00:00
Android Build Merger (Role)
7ee280f8b5 [automerger] RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission. am: 295af36009 
Change-Id: I277a26c94cde1e77ddef8ddbc81dad3c963def8f
 2018-09-05 20:38:53 +00:00
Wale Ogunwale
295af36009 RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission. 
1: Cherry-pick ag/4067454 - Setting PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS
updateNonSystemOverlayWindowsVisibilityIfNeeded on relayoutWindow

2: Cherry-pick ag/3650369 - If PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS changed on
relayoutWindow() then updateNonSystemOverlayWindowsVisibilityIfNeeded

3: Add permissions to SystemUI to allow it to hide non-system overlays

Bug: 34170870
Test: manual (see bug for poc)
Change-Id: I57cb0f390d9a78e721c5ddce49a377d385002753
 2018-09-05 20:38:50 +00:00
Android Build Merger (Role)
6619efdd68 [automerger skipped] Hide overlay windows when requesting media projection permission. skipped: 5c3f5a02bd skipped: 3eb97a9bd9 skipped: 50f6c53a1a skipped: defeb8c596 
Change-Id: Ia209169eb2587ede53cc0199c5eaa79f5819e674
 2018-09-05 20:38:06 +00:00
Android Build Merger (Role)
defeb8c596 [automerger skipped] Hide overlay windows when requesting media projection permission. skipped: 5c3f5a02bd skipped: 3eb97a9bd9 skipped: 50f6c53a1a 
Change-Id: I1e986e823c9fcb1fc11e3d634e0c6b31725a57c5
 2018-09-05 20:38:00 +00:00
Android Build Merger (Role)
50f6c53a1a [automerger skipped] Hide overlay windows when requesting media projection permission. skipped: 5c3f5a02bd skipped: 3eb97a9bd9 
Change-Id: Icec5121efdff64b3352ac985141f612277549b6d
 2018-09-05 20:37:54 +00:00
Android Build Merger (Role)
3eb97a9bd9 [automerger skipped] Hide overlay windows when requesting media projection permission. skipped: 5c3f5a02bd 
Change-Id: I76ade50f15b706e3f4e6acc156884b83967e4b40
 2018-09-05 20:37:48 +00:00
Wale Ogunwale
5c3f5a02bd Hide overlay windows when requesting media projection permission. 
1: Cherry-pick ag/4067454 - Setting PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS
updateNonSystemOverlayWindowsVisibilityIfNeeded on relayoutWindow

2: Cherry-pick ag/3650369 - If PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS changed on
relayoutWindow() then updateNonSystemOverlayWindowsVisibilityIfNeeded

3: Add permissions to SystemUI to allow it to hide non-system overlays

Bug: 34170870
Test: manual (see bug for poc)
Change-Id: I57cb0f390d9a78e721c5ddce49a377d385002753
 2018-09-05 20:37:34 +00:00
Android Build Merger (Role)
686897ddd9 [automerger] Verify number of Map entries written to Parcel am: 057a01d1f3 am: d6947f1cbf am: 628cbe5c53 am: 433e4173ec 
Change-Id: I8375f1c1a860f5021efc5873e94b452a44d6c145
 2018-08-30 20:46:12 +00:00
Android Build Merger (Role)
433e4173ec [automerger] Verify number of Map entries written to Parcel am: 057a01d1f3 am: d6947f1cbf am: 628cbe5c53 
Change-Id: Id32bd5aa02d5689873bb311eebc87f367af9a9d9
 2018-08-30 20:46:05 +00:00
Android Build Merger (Role)
628cbe5c53 [automerger] Verify number of Map entries written to Parcel am: 057a01d1f3 am: d6947f1cbf 
Change-Id: Idaab5395d9e0970fe57b017bcba10f8757ffe3c7
 2018-08-30 20:45:59 +00:00
Android Build Merger (Role)
d6947f1cbf [automerger] Verify number of Map entries written to Parcel am: 057a01d1f3 
Change-Id: Idb2572b46c48fe2f3e4b99c5cb4372dcfe6b20ce
 2018-08-30 20:45:51 +00:00
Michael Wachenschwanz
057a01d1f3 Verify number of Map entries written to Parcel 
Make sure the number of entries written by Parcel#writeMapInternal
matches the size written. If a mismatch were allowed, an exploitable
scenario could occur where the data read from the Parcel would not
match the data written.

Fixes: 112859604
Test: cts-tradefed run cts -m CtsOsTestCases -t android.os.cts.ParcelTest

Change-Id: I325d08a8b66b6e80fe76501359c41b6656848607
Merged-In: I325d08a8b66b6e80fe76501359c41b6656848607
 2018-08-30 13:40:44 -07:00
Android Build Merger (Role)
879ecd17ab [automerger] RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions. am: 8da6786608 am: 7d153c56c6 am: eff2a46342 am: ee4a2aee83 
Change-Id: Ieaa5386305a8d359b5b79d99925bd12696bbce2a
 2018-08-24 22:45:36 +00:00
Android Build Merger (Role)
ee4a2aee83 [automerger] RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions. am: 8da6786608 am: 7d153c56c6 am: eff2a46342 
Change-Id: I2f97a9e176348ae81e9d72f8cb3c22e3f74c0a81
 2018-08-24 22:45:29 +00:00
Android Build Merger (Role)
eff2a46342 [automerger] RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions. am: 8da6786608 am: 7d153c56c6 
Change-Id: Idba111169b057b88a7b47dde4b734ede2c651310
 2018-08-24 22:45:22 +00:00
Android Build Merger (Role)
7d153c56c6 [automerger] RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions. am: 8da6786608 
Change-Id: I2c9174d4b065aada8c4ba95e864b3628dd1f0975
 2018-08-24 22:45:15 +00:00
akirilov
8da6786608 RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions. 
Bug: 111752150
Test: Manual local test
Change-Id: I0b48a20525f87fc6f5ab8d7e70aa7d11cd747f97
 2018-08-24 22:45:13 +00:00
Mihai Popa
9ea0739c99 Merge changes from topic "am-0f30ee3d-94a0-4dc3-bb14-762781265ad9" into nyc-mr2-dev 
* changes:
  [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f am: 04c7154fd9 am: 65082f8f5b am: 74ffd2bc55 am: f7f008f573 am: 7693ce7eaf
  [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f am: 04c7154fd9 am: 65082f8f5b am: 74ffd2bc55 am: f7f008f573
  [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f am: 04c7154fd9 am: 65082f8f5b am: 74ffd2bc55
  [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f am: 04c7154fd9 am: 65082f8f5b
  [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f am: 04c7154fd9
  [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f
  [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2
  [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea
  Fix crash during cursor moving on BiDi text
 2018-08-15 19:23:35 +00:00
Mihai Popa
3504302bb2 Merge changes from topic "am-0f30ee3d-94a0-4dc3-bb14-762781265ad9" into cw-f-dev 
* changes:
  [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f am: 04c7154fd9 am: 65082f8f5b am: 74ffd2bc55 am: f7f008f573
  [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f am: 04c7154fd9 am: 65082f8f5b am: 74ffd2bc55
  [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f am: 04c7154fd9 am: 65082f8f5b
  [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f am: 04c7154fd9
  [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f
  [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2
  [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea
  Fix crash during cursor moving on BiDi text
 2018-08-15 19:23:35 +00:00
Mihai Popa
0075139902 Merge changes from topic "am-0f30ee3d-94a0-4dc3-bb14-762781265ad9" into nyc-mr1-dev 
* changes:
  [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f am: 04c7154fd9 am: 65082f8f5b am: 74ffd2bc55
  [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f am: 04c7154fd9 am: 65082f8f5b
  [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f am: 04c7154fd9
  [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f
  [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2
  [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea
  Fix crash during cursor moving on BiDi text
 2018-08-15 19:23:35 +00:00
Mihai Popa
1425bb41aa Merge changes from topic "am-0f30ee3d-94a0-4dc3-bb14-762781265ad9" into nyc-dr1-dev 
* changes:
  [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f am: 04c7154fd9 am: 65082f8f5b
  [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f am: 04c7154fd9
  [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f
  [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2
  [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea
  Fix crash during cursor moving on BiDi text
 2018-08-15 19:23:35 +00:00
Mihai Popa
bf441335ea Merge changes from topic "am-0f30ee3d-94a0-4dc3-bb14-762781265ad9" into nyc-dev 
* changes:
  [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f am: 04c7154fd9
  [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f
  [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2
  [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea
  Fix crash during cursor moving on BiDi text
 2018-08-15 19:23:35 +00:00