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

OSDN Git Service

(root) / android-x86 / frameworks-base.git / log

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 23:23:35 +0000 (23:23 +0000)]

[automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad am: 523fed0deb am: 04e84bb0ec am: 0dcedd2073 am: fe998dfc30 am: 93c80434f2 am: a40ac0dc8e

Change-Id: I70e9b520f0c262000718e64f1d2b96410739f0bb

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 23:23:30 +0000 (23:23 +0000)]

[automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad am: 523fed0deb am: 04e84bb0ec am: 0dcedd2073 am: fe998dfc30 am: 93c80434f2

Change-Id: I22bed228480d22ac630abe6b52d6e5d42685f51d

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 23:23:24 +0000 (23:23 +0000)]

[automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad am: 523fed0deb am: 04e84bb0ec am: 0dcedd2073 am: fe998dfc30

Change-Id: Ie269466813811e45af06597dcd9f765039d4c7cf

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 23:23:18 +0000 (23:23 +0000)]

[automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad am: 523fed0deb am: 04e84bb0ec am: 0dcedd2073

Change-Id: I20247f18f27d668e38c6dbf6e79ce184d3641298

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 23:23:06 +0000 (23:23 +0000)]

[automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad am: 523fed0deb am: 04e84bb0ec

Change-Id: I3cb0275cf475b0551dec3b9e4fbc6301756fb15d

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 23:23:01 +0000 (23:23 +0000)]

[automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad am: 523fed0deb

Change-Id: I4e69906486cfec4c4db7cbb119df1d55aec55675

commit | commitdiff | tree

Etan Cohen [Wed, 7 Feb 2018 23:22:41 +0000 (23:22 +0000)]

Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev
am: 0153ac9dad

Change-Id: I2a07841e7cd27f2ba7c30f9b2df5ddf1afcc6ef5

commit | commitdiff | tree

Etan Cohen [Wed, 7 Feb 2018 22:41:26 +0000 (22:41 +0000)]

Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-mr2-dev

* changes:
  [automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4 am: 8d2d052b61 am: af9f48b7e8 am: ee65cf4766 am: d38155fc59 am: e016e9c975 am: 839c0ed22d
  [automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4 am: 8d2d052b61 am: af9f48b7e8 am: ee65cf4766 am: d38155fc59 am: e016e9c975
  [automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4 am: 8d2d052b61 am: af9f48b7e8 am: ee65cf4766 am: d38155fc59
  [automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4 am: 8d2d052b61 am: af9f48b7e8 am: ee65cf4766
  [automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4 am: 8d2d052b61 am: af9f48b7e8
  [automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4 am: 8d2d052b61
  [automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4
  [automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c
  [RTT] ParcelableRttResults parcel code fix

commit | commitdiff | tree

Etan Cohen [Wed, 7 Feb 2018 22:41:26 +0000 (22:41 +0000)]

Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into cw-f-dev

* changes:
  [automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4 am: 8d2d052b61 am: af9f48b7e8 am: ee65cf4766 am: d38155fc59 am: e016e9c975
  [automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4 am: 8d2d052b61 am: af9f48b7e8 am: ee65cf4766 am: d38155fc59
  [automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4 am: 8d2d052b61 am: af9f48b7e8 am: ee65cf4766
  [automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4 am: 8d2d052b61 am: af9f48b7e8
  [automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4 am: 8d2d052b61
  [automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4
  [automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c
  [RTT] ParcelableRttResults parcel code fix

commit | commitdiff | tree

Etan Cohen [Wed, 7 Feb 2018 22:41:26 +0000 (22:41 +0000)]

Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-mr1-dev

* changes:
  [automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4 am: 8d2d052b61 am: af9f48b7e8 am: ee65cf4766 am: d38155fc59
  [automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4 am: 8d2d052b61 am: af9f48b7e8 am: ee65cf4766
  [automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4 am: 8d2d052b61 am: af9f48b7e8
  [automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4 am: 8d2d052b61
  [automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4
  [automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c
  [RTT] ParcelableRttResults parcel code fix

commit | commitdiff | tree

Etan Cohen [Wed, 7 Feb 2018 22:41:26 +0000 (22:41 +0000)]

Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-dr1-dev

* changes:
  [automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4 am: 8d2d052b61 am: af9f48b7e8 am: ee65cf4766
  [automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4 am: 8d2d052b61 am: af9f48b7e8
  [automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4 am: 8d2d052b61
  [automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4
  [automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c
  [RTT] ParcelableRttResults parcel code fix

commit | commitdiff | tree

Etan Cohen [Wed, 7 Feb 2018 22:41:26 +0000 (22:41 +0000)]

Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-dev

* changes:
  [automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4 am: 8d2d052b61 am: af9f48b7e8
  [automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4 am: 8d2d052b61
  [automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4
  [automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c
  [RTT] ParcelableRttResults parcel code fix

commit | commitdiff | tree

Etan Cohen [Wed, 7 Feb 2018 22:41:26 +0000 (22:41 +0000)]

Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr1.5-dev

* changes:
  [automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4 am: 8d2d052b61
  [automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4
  [automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c
  [RTT] ParcelableRttResults parcel code fix

commit | commitdiff | tree

Etan Cohen [Wed, 7 Feb 2018 22:41:26 +0000 (22:41 +0000)]

Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into cw-e-dev

* changes:
  [automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4
  [automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c
  [RTT] ParcelableRttResults parcel code fix

commit | commitdiff | tree

Etan Cohen [Wed, 7 Feb 2018 22:41:26 +0000 (22:41 +0000)]

Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev

* changes:
[automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c
[RTT] ParcelableRttResults parcel code fix

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 08:18:57 +0000 (08:18 +0000)]

[automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888 am: 0231bc4d6d am: 83cb35453f am: 4405b0ced2 am: b3012285e2 am: ab36ba8483 am: 4af59f1c97 am: f097744926

Change-Id: Ic3e36a94f5c7b3cf33b8c7972fc1bd254be9a31c

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 08:18:50 +0000 (08:18 +0000)]

[automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888 am: 0231bc4d6d am: 83cb35453f am: 4405b0ced2 am: b3012285e2 am: ab36ba8483 am: 4af59f1c97

Change-Id: Ic3b71eb297425e9ff6d40c542aa67027317dffea

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 08:18:44 +0000 (08:18 +0000)]

[automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888 am: 0231bc4d6d am: 83cb35453f am: 4405b0ced2 am: b3012285e2 am: ab36ba8483

Change-Id: Ie3d39f4c402d3385f45aca01059f03ef4025855f

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 08:18:37 +0000 (08:18 +0000)]

[automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888 am: 0231bc4d6d am: 83cb35453f am: 4405b0ced2 am: b3012285e2

Change-Id: I76a950ed4296cad67230c36ee9edc0b7cc905c60

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 08:18:22 +0000 (08:18 +0000)]

[automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888 am: 0231bc4d6d am: 83cb35453f am: 4405b0ced2

Change-Id: I7c984a83858ee5bb0b84d122dac27e0273f0a177

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 08:18:15 +0000 (08:18 +0000)]

[automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888 am: 0231bc4d6d am: 83cb35453f

Change-Id: Ib6d585953a35d3d00ab51144af7639c851ac3d72

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 08:18:09 +0000 (08:18 +0000)]

[automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888 am: 0231bc4d6d

Change-Id: I060b6306f3f53b4497b6a19d7221aa1938e66f55

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 08:18:02 +0000 (08:18 +0000)]

[automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888

Change-Id: Ib1b60818cddeefe3031cf6c9880f5b790775aa62

commit | commitdiff | tree

Rubin Xu [Wed, 7 Feb 2018 08:10:08 +0000 (08:10 +0000)]

Fix VerifyCredentialResponse parcelling code

There was an asymmetry between parcelling and unparcelling of
VerifyCredentialResponse that could lead to type confusion if
packed with other objects in a Parcel.

Test: none
Bug: 71714464
Change-Id: Icff68879e249422ccca49f2bb7db85c35b4cb353

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 2 Feb 2018 18:16:40 +0000 (18:16 +0000)]

[automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4 am: 8d2d052b61 am: af9f48b7e8 am: ee65cf4766 am: d38155fc59 am: e016e9c975 am: 839c0ed22d

Change-Id: If80acece5df0e149bf832970cf4ee1ba60877e71

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 2 Feb 2018 18:16:35 +0000 (18:16 +0000)]

[automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4 am: 8d2d052b61 am: af9f48b7e8 am: ee65cf4766 am: d38155fc59 am: e016e9c975

Change-Id: I57936e6a45df8f40d3d1aa7a72d57ea40e9b5909

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 2 Feb 2018 18:16:30 +0000 (18:16 +0000)]

[automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4 am: 8d2d052b61 am: af9f48b7e8 am: ee65cf4766 am: d38155fc59

Change-Id: I74d9fbe30fd93e43cfa9d5b3d7eae64418163924

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 2 Feb 2018 18:16:25 +0000 (18:16 +0000)]

[automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4 am: 8d2d052b61 am: af9f48b7e8 am: ee65cf4766

Change-Id: I15d12616e80cfd1b4d03a76ef1030fa2003a83d2

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 2 Feb 2018 18:16:12 +0000 (18:16 +0000)]

[automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4 am: 8d2d052b61 am: af9f48b7e8

Change-Id: I5a6d8519fc77c96d2df7afc58c1d45af57250e8b

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 2 Feb 2018 18:16:07 +0000 (18:16 +0000)]

[automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4 am: 8d2d052b61

Change-Id: I2be402278897c6d97207672f8bfc5af8cbc6dc6d

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 2 Feb 2018 18:16:00 +0000 (18:16 +0000)]

[automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4

Change-Id: I371f3a2967a5a7a826bca94637a78b7dae7c2cd8

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 2 Feb 2018 18:15:53 +0000 (18:15 +0000)]

[automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c

Change-Id: I46bbee504ea7a64d39b98a2a8336b3bcf593869a

commit | commitdiff | tree

Etan Cohen [Fri, 2 Feb 2018 16:07:20 +0000 (08:07 -0800)]

[RTT] ParcelableRttResults parcel code fix

ParcelableRttResults was unparceled incorrectly.

Bug: 70398564
Test: exploit provided in bug no longer works
Change-Id: Ifd6de547e9861bbebc399b43d0cc2899a8160813

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 1 Feb 2018 14:14:55 +0000 (14:14 +0000)]

[automerger] Merge "Adjust URI host parsing to stop on \ character." into lmp-mr1-dev am: 5ed5d15e66 am: 8a0c7fd99e am: c1cb058249 am: 2c70774e72 am: 3ec9cb8d3a am: 2876452814 am: af5c532cc8 am: 86948aa610 am: abab079bf5

Change-Id: Id4a9288f60adf16b25e8c908dba5a0b4b80efd03

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 1 Feb 2018 14:14:50 +0000 (14:14 +0000)]

[automerger] Merge "Adjust URI host parsing to stop on \ character." into lmp-mr1-dev am: 5ed5d15e66 am: 8a0c7fd99e am: c1cb058249 am: 2c70774e72 am: 3ec9cb8d3a am: 2876452814 am: af5c532cc8 am: 86948aa610

Change-Id: I54351ca2122f59d01ebc36377efca2c22c4a89de

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 1 Feb 2018 14:14:45 +0000 (14:14 +0000)]

[automerger] Merge "Adjust URI host parsing to stop on \ character." into lmp-mr1-dev am: 5ed5d15e66 am: 8a0c7fd99e am: c1cb058249 am: 2c70774e72 am: 3ec9cb8d3a am: 2876452814 am: af5c532cc8

Change-Id: I1038ed8069ddb086c8a098d5dccddfee887b8807

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 1 Feb 2018 14:14:40 +0000 (14:14 +0000)]

[automerger] Merge "Adjust URI host parsing to stop on \ character." into lmp-mr1-dev am: 5ed5d15e66 am: 8a0c7fd99e am: c1cb058249 am: 2c70774e72 am: 3ec9cb8d3a am: 2876452814

Change-Id: I1b8b8bdfd800c6bed1a8c3e69ef9ba81b9fe2bf2

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 1 Feb 2018 14:14:27 +0000 (14:14 +0000)]

[automerger] Merge "Adjust URI host parsing to stop on \ character." into lmp-mr1-dev am: 5ed5d15e66 am: 8a0c7fd99e am: c1cb058249 am: 2c70774e72 am: 3ec9cb8d3a

Change-Id: I964d1b8a03e24cc51b8c385d2a04c4a6a338aa36

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 1 Feb 2018 14:14:22 +0000 (14:14 +0000)]

[automerger] Merge "Adjust URI host parsing to stop on \ character." into lmp-mr1-dev am: 5ed5d15e66 am: 8a0c7fd99e am: c1cb058249 am: 2c70774e72

Change-Id: I982742b65d3ae6941b274c147d09ce6f50533c1e

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 1 Feb 2018 14:14:17 +0000 (14:14 +0000)]

[automerger] Merge "Adjust URI host parsing to stop on \ character." into lmp-mr1-dev am: 5ed5d15e66 am: 8a0c7fd99e am: c1cb058249

Change-Id: I1ea542611301d0c4359021303b05a5e59ee1185b

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 1 Feb 2018 14:14:11 +0000 (14:14 +0000)]

[automerger] Merge "Adjust URI host parsing to stop on \ character." into lmp-mr1-dev am: 5ed5d15e66 am: 8a0c7fd99e

Change-Id: If53ecf0654e883fa43e2f543561f0f7994763698

commit | commitdiff | tree

Adam Vartanian [Thu, 1 Feb 2018 14:13:34 +0000 (14:13 +0000)]

Merge "Adjust URI host parsing to stop on \ character." into lmp-mr1-dev
am: 5ed5d15e66

Change-Id: I7eb106b0db3ab568a7d8845ddd2025d80eeced3c

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 1 Feb 2018 14:06:52 +0000 (14:06 +0000)]

[automerger] Merge changes from topic "am-f1eb5cc5-7ac1-4540-b9cf-e0577f9334e7" into mnc-dr-dev am: fea4158eea am: 8fbe4e673f am: 3534bc9786 am: 4021c84e85 am: 2e2580e6bd am: 7caae808a8 am: 349d1c1be5

Change-Id: I3cf57dd4a6bf94731b963602b84af31913de743d

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 1 Feb 2018 14:06:46 +0000 (14:06 +0000)]

[automerger] Merge changes from topic "am-f1eb5cc5-7ac1-4540-b9cf-e0577f9334e7" into mnc-dr-dev am: fea4158eea am: 8fbe4e673f am: 3534bc9786 am: 4021c84e85 am: 2e2580e6bd am: 7caae808a8

Change-Id: I63980272300f26d8ded0154fc3fb4886cb6df17e

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 1 Feb 2018 14:06:40 +0000 (14:06 +0000)]

[automerger] Merge changes from topic "am-f1eb5cc5-7ac1-4540-b9cf-e0577f9334e7" into mnc-dr-dev am: fea4158eea am: 8fbe4e673f am: 3534bc9786 am: 4021c84e85 am: 2e2580e6bd

Change-Id: I506e5707bb4eb541740909d36679691f0fd8caf9

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 1 Feb 2018 14:06:34 +0000 (14:06 +0000)]

[automerger] Merge changes from topic "am-f1eb5cc5-7ac1-4540-b9cf-e0577f9334e7" into mnc-dr-dev am: fea4158eea am: 8fbe4e673f am: 3534bc9786 am: 4021c84e85

Change-Id: Ib248b06c7d6a3c90020e43e04554af39918be955

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 1 Feb 2018 14:06:20 +0000 (14:06 +0000)]

[automerger] Merge changes from topic "am-f1eb5cc5-7ac1-4540-b9cf-e0577f9334e7" into mnc-dr-dev am: fea4158eea am: 8fbe4e673f am: 3534bc9786

Change-Id: I3649d3b8bfa880ac44c88f5f6672b94877345911

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 1 Feb 2018 14:06:15 +0000 (14:06 +0000)]

[automerger] Merge changes from topic "am-f1eb5cc5-7ac1-4540-b9cf-e0577f9334e7" into mnc-dr-dev am: fea4158eea am: 8fbe4e673f

Change-Id: Ifd6fc978fb4544f7f4c9fe99599d472c10b071ac

commit | commitdiff | tree

Adam Vartanian [Thu, 1 Feb 2018 14:05:44 +0000 (14:05 +0000)]

Merge changes from topic "am-f1eb5cc5-7ac1-4540-b9cf-e0577f9334e7" into mnc-dr-dev
am: fea4158eea

Change-Id: Iea20c91a29115634c2241f535c4a0c489605798f

commit | commitdiff | tree

Adam Vartanian [Thu, 1 Feb 2018 10:02:43 +0000 (10:02 +0000)]

Merge changes from topic "am-f1eb5cc5-7ac1-4540-b9cf-e0577f9334e7" into mnc-dr-dev

* changes:
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7
  Adjust URI host parsing to stop on \ character.

commit | commitdiff | tree

Adam Vartanian [Thu, 1 Feb 2018 10:02:43 +0000 (10:02 +0000)]

Merge changes from topic "am-f1eb5cc5-7ac1-4540-b9cf-e0577f9334e7" into mnc-dev

* changes:
[automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7
Adjust URI host parsing to stop on \ character.

commit | commitdiff | tree

Adam Vartanian [Thu, 1 Feb 2018 10:02:43 +0000 (10:02 +0000)]

Merge changes from topic "am-f1eb5cc5-7ac1-4540-b9cf-e0577f9334e7" into nyc-mr2-dev

* changes:
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2 am: d3c0db66b9 am: 373cfa75c0 am: bdff04aba3 am: 7341805cac am: 885a2ecf96 am: 54f1b302ab
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2 am: d3c0db66b9 am: 373cfa75c0 am: bdff04aba3 am: 7341805cac am: 885a2ecf96
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2 am: d3c0db66b9 am: 373cfa75c0 am: bdff04aba3 am: 7341805cac
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2 am: d3c0db66b9 am: 373cfa75c0 am: bdff04aba3
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2 am: d3c0db66b9 am: 373cfa75c0
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2 am: d3c0db66b9
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7
  Adjust URI host parsing to stop on \ character.

commit | commitdiff | tree

Adam Vartanian [Thu, 1 Feb 2018 10:02:43 +0000 (10:02 +0000)]

Merge changes from topic "am-f1eb5cc5-7ac1-4540-b9cf-e0577f9334e7" into nyc-mr1-dev

* changes:
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2 am: d3c0db66b9 am: 373cfa75c0 am: bdff04aba3 am: 7341805cac
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2 am: d3c0db66b9 am: 373cfa75c0 am: bdff04aba3
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2 am: d3c0db66b9 am: 373cfa75c0
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2 am: d3c0db66b9
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7
  Adjust URI host parsing to stop on \ character.

commit | commitdiff | tree

Adam Vartanian [Thu, 1 Feb 2018 10:02:43 +0000 (10:02 +0000)]

Merge changes from topic "am-f1eb5cc5-7ac1-4540-b9cf-e0577f9334e7" into nyc-dr1-dev

* changes:
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2 am: d3c0db66b9 am: 373cfa75c0 am: bdff04aba3
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2 am: d3c0db66b9 am: 373cfa75c0
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2 am: d3c0db66b9
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7
  Adjust URI host parsing to stop on \ character.

commit | commitdiff | tree

Adam Vartanian [Thu, 1 Feb 2018 10:02:43 +0000 (10:02 +0000)]

Merge changes from topic "am-f1eb5cc5-7ac1-4540-b9cf-e0577f9334e7" into mnc-dr1.5-dev

* changes:
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2 am: d3c0db66b9
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7
  Adjust URI host parsing to stop on \ character.

commit | commitdiff | tree

Adam Vartanian [Thu, 1 Feb 2018 10:02:42 +0000 (10:02 +0000)]

Merge "Adjust URI host parsing to stop on \ character." into lmp-mr1-dev

commit | commitdiff | tree

Adam Vartanian [Thu, 1 Feb 2018 10:02:42 +0000 (10:02 +0000)]

Merge changes from topic "am-f1eb5cc5-7ac1-4540-b9cf-e0577f9334e7" into cw-f-dev

* changes:
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2 am: d3c0db66b9 am: 373cfa75c0 am: bdff04aba3 am: 7341805cac am: 885a2ecf96
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2 am: d3c0db66b9 am: 373cfa75c0 am: bdff04aba3 am: 7341805cac
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2 am: d3c0db66b9 am: 373cfa75c0 am: bdff04aba3
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2 am: d3c0db66b9 am: 373cfa75c0
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2 am: d3c0db66b9
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7
  Adjust URI host parsing to stop on \ character.

commit | commitdiff | tree

Adam Vartanian [Thu, 1 Feb 2018 10:02:42 +0000 (10:02 +0000)]

Merge changes from topic "am-f1eb5cc5-7ac1-4540-b9cf-e0577f9334e7" into nyc-dev

* changes:
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2 am: d3c0db66b9 am: 373cfa75c0
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2 am: d3c0db66b9
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7
  Adjust URI host parsing to stop on \ character.

commit | commitdiff | tree

Adam Vartanian [Thu, 1 Feb 2018 10:02:42 +0000 (10:02 +0000)]

Merge changes from topic "am-f1eb5cc5-7ac1-4540-b9cf-e0577f9334e7" into cw-e-dev

* changes:
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7
  Adjust URI host parsing to stop on \ character.

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 31 Jan 2018 22:30:44 +0000 (22:30 +0000)]

Merge changes from topic "am-1ab9514f-fd12-4093-b1cb-a77e9f0419c9" into cw-f-dev
am: afb1b1aeb6

Change-Id: I4d2f501b942e2a7dd6c2a3415758ce76087f1b78

commit | commitdiff | tree

TreeHugger Robot [Wed, 31 Jan 2018 22:13:40 +0000 (22:13 +0000)]

Merge changes from topic "am-1ab9514f-fd12-4093-b1cb-a77e9f0419c9" into cw-f-dev

* changes:
  [automerger] Check for null-terminator in ResStringPool::string8At am: 5ec65ae909 am: c3d7250b99 am: e2417e6682 am: 0ab4540c41 am: a3f0976937 am: 166aa6e149 am: b7f7f7e14e am: c26b8635b7
  [automerger] Check for null-terminator in ResStringPool::string8At am: 5ec65ae909 am: c3d7250b99 am: e2417e6682 am: 0ab4540c41 am: a3f0976937 am: 166aa6e149 am: b7f7f7e14e
  [automerger] Check for null-terminator in ResStringPool::string8At am: 5ec65ae909 am: c3d7250b99 am: e2417e6682 am: 0ab4540c41 am: a3f0976937 am: 166aa6e149
  [automerger] Check for null-terminator in ResStringPool::string8At am: 5ec65ae909 am: c3d7250b99 am: e2417e6682 am: 0ab4540c41 am: a3f0976937
  [automerger] Check for null-terminator in ResStringPool::string8At am: 5ec65ae909 am: c3d7250b99 am: e2417e6682 am: 0ab4540c41
  [automerger] Check for null-terminator in ResStringPool::string8At am: 5ec65ae909 am: c3d7250b99 am: e2417e6682
  [automerger] Check for null-terminator in ResStringPool::string8At am: 5ec65ae909 am: c3d7250b99
  [automerger] Check for null-terminator in ResStringPool::string8At am: 5ec65ae909
  Check for null-terminator in ResStringPool::string8At

commit | commitdiff | tree

TreeHugger Robot [Wed, 31 Jan 2018 22:13:40 +0000 (22:13 +0000)]

Merge changes from topic "am-1ab9514f-fd12-4093-b1cb-a77e9f0419c9" into nyc-mr2-dev

* changes:
  [automerger] Check for null-terminator in ResStringPool::string8At am: 5ec65ae909 am: c3d7250b99 am: e2417e6682 am: 0ab4540c41 am: a3f0976937 am: 166aa6e149 am: b7f7f7e14e am: c26b8635b7 am: afac0f46d9
  [automerger] Check for null-terminator in ResStringPool::string8At am: 5ec65ae909 am: c3d7250b99 am: e2417e6682 am: 0ab4540c41 am: a3f0976937 am: 166aa6e149 am: b7f7f7e14e am: c26b8635b7
  [automerger] Check for null-terminator in ResStringPool::string8At am: 5ec65ae909 am: c3d7250b99 am: e2417e6682 am: 0ab4540c41 am: a3f0976937 am: 166aa6e149 am: b7f7f7e14e
  [automerger] Check for null-terminator in ResStringPool::string8At am: 5ec65ae909 am: c3d7250b99 am: e2417e6682 am: 0ab4540c41 am: a3f0976937 am: 166aa6e149
  [automerger] Check for null-terminator in ResStringPool::string8At am: 5ec65ae909 am: c3d7250b99 am: e2417e6682 am: 0ab4540c41 am: a3f0976937
  [automerger] Check for null-terminator in ResStringPool::string8At am: 5ec65ae909 am: c3d7250b99 am: e2417e6682 am: 0ab4540c41
  [automerger] Check for null-terminator in ResStringPool::string8At am: 5ec65ae909 am: c3d7250b99 am: e2417e6682
  [automerger] Check for null-terminator in ResStringPool::string8At am: 5ec65ae909 am: c3d7250b99
  [automerger] Check for null-terminator in ResStringPool::string8At am: 5ec65ae909
  Check for null-terminator in ResStringPool::string8At

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 31 Jan 2018 11:21:02 +0000 (11:21 +0000)]

[automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2 am: d3c0db66b9 am: 373cfa75c0 am: bdff04aba3 am: 7341805cac am: 885a2ecf96 am: 54f1b302ab

Change-Id: I09260b353e45dac4c59b920b0166d40b3eb810aa

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 31 Jan 2018 11:20:55 +0000 (11:20 +0000)]

[automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2 am: d3c0db66b9 am: 373cfa75c0 am: bdff04aba3 am: 7341805cac am: 885a2ecf96

Change-Id: Ie23e4a58c906b1afe4e47e915251d44c628c9a72

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 31 Jan 2018 11:20:48 +0000 (11:20 +0000)]

[automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2 am: d3c0db66b9 am: 373cfa75c0 am: bdff04aba3 am: 7341805cac

Change-Id: Ib4cb67450dcb8e35693030d77e2ec815d23275d1

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 31 Jan 2018 11:20:41 +0000 (11:20 +0000)]

[automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2 am: d3c0db66b9 am: 373cfa75c0 am: bdff04aba3

Change-Id: Ieddabe1b12f34bd7632ce893ef4e0c298f5c44df

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 31 Jan 2018 11:20:28 +0000 (11:20 +0000)]

[automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2 am: d3c0db66b9 am: 373cfa75c0

Change-Id: Ia7b1157fb7f2066e26dc82ec703f39cd9fa69fd7

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 31 Jan 2018 11:20:21 +0000 (11:20 +0000)]

[automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2 am: d3c0db66b9

Change-Id: If07298bb4ecf8a55391a014568a3ea264358b0e9

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 31 Jan 2018 11:20:15 +0000 (11:20 +0000)]

[automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2

Change-Id: I3fd20a3ee5eaa6be1c1989f13d40aed34136557e

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 31 Jan 2018 11:20:08 +0000 (11:20 +0000)]

[automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137

Change-Id: Ic336b5fafebabdd4a5ad4d775a96d76739189a09

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 31 Jan 2018 11:19:56 +0000 (11:19 +0000)]

[automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7

Change-Id: I20336a5786e753e6941b9a784068480475415110

commit | commitdiff | tree

Adam Vartanian [Wed, 31 Jan 2018 11:05:10 +0000 (11:05 +0000)]

Adjust URI host parsing to stop on \ character.

The WHATWG URL parsing algorithm [1] used by browsers says that for
"special" URL schemes (which is basically all commonly-used
hierarchical schemes, including http, https, ftp, and file), the host
portion ends if a \ character is seen, whereas this class previously
continued to consider characters part of the hostname. This meant
that a malicious URL could be seen as having a "safe" host when viewed
by an app but navigate to a different host when passed to a browser.

[1] https://url.spec.whatwg.org/#host-state

Bug: 71360761
Test: vogar frameworks/base/core/tests/coretests/src/android/net/UriTest.java (on NYC branch)
Test: cts -m CtsNetTestCases (on NYC branch)
Change-Id: Id53f7054d1be8d59bbcc7e219159e59a2425106e

commit | commitdiff | tree

Bill Yi [Thu, 25 Jan 2018 21:48:06 +0000 (21:48 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: 41ee2787b4 -s ours

Change-Id: Ic8c5c22925b1249c6041075cd67967cbbfd3fd21

commit | commitdiff | tree

Bill Yi [Thu, 25 Jan 2018 21:45:40 +0000 (21:45 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: 407d338837 -s ours

Change-Id: Ic2af52ea4156e11d19ae5ded4e86a7163d876903

commit | commitdiff | tree

Bill Yi [Thu, 25 Jan 2018 19:22:07 +0000 (19:22 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: 16b6bdf5a5 -s ours

Change-Id: Ibcd4c5627e0a7fb62fd32374debbfb4f52bc52d9

commit | commitdiff | tree

Bill Yi [Thu, 25 Jan 2018 19:15:45 +0000 (19:15 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: 28815c5b0e -s ours

Change-Id: I629a9d1b140dff3fa2f96d28bae37e062879e1d2

commit | commitdiff | tree

Bill Yi [Thu, 25 Jan 2018 19:12:11 +0000 (19:12 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: d6df52e22f -s ours

Change-Id: I69117be7b79ef4765d9390b34c0101141ba7831a

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 25 Jan 2018 19:05:59 +0000 (19:05 +0000)]

Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 1d77757fb5 -s ours" into nyc-mr2-dev

commit | commitdiff | tree

Bill Yi [Thu, 25 Jan 2018 19:04:46 +0000 (19:04 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: 1d77757fb5 -s ours

Change-Id: I7e07b391f3af5df8b4077fe3c1c357cb14afcc18

commit | commitdiff | tree

TreeHugger Robot [Thu, 25 Jan 2018 19:04:37 +0000 (19:04 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

commit | commitdiff | tree

TreeHugger Robot [Thu, 25 Jan 2018 19:04:37 +0000 (19:04 +0000)]

Merge changes from topic "am-cfa86bae-47ed-4c92-b3ac-8400ba6eb201" into nyc-mr2-dev

* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: 4f9f892582
Import translations. DO NOT MERGE

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 25 Jan 2018 18:57:49 +0000 (18:57 +0000)]

Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 0fa3646a34 -s ours" into nyc-mr2-dev

commit | commitdiff | tree

TreeHugger Robot [Thu, 25 Jan 2018 18:57:01 +0000 (18:57 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

commit | commitdiff | tree

TreeHugger Robot [Thu, 25 Jan 2018 18:57:01 +0000 (18:57 +0000)]

Merge changes from topic "am-8df06f4c-7127-41db-a6a2-64c67bb75497" into nyc-mr2-dev

* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: aa7eca2f03
Import translations. DO NOT MERGE

commit | commitdiff | tree

Bill Yi [Thu, 25 Jan 2018 18:56:32 +0000 (18:56 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: 0fa3646a34 -s ours

Change-Id: Icdd5b7e1f54acae9914fd79949584ce80d5a489c

commit | commitdiff | tree

TreeHugger Robot [Thu, 25 Jan 2018 18:50:36 +0000 (18:50 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

commit | commitdiff | tree

TreeHugger Robot [Thu, 25 Jan 2018 18:50:36 +0000 (18:50 +0000)]

Merge changes from topic "am-8df3bdfc-9f3c-40b2-b051-5cc0120da88b" into nyc-mr2-dev

* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: 816ddbdba7
Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Thu, 25 Jan 2018 18:48:29 +0000 (18:48 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

commit | commitdiff | tree

TreeHugger Robot [Thu, 25 Jan 2018 18:48:29 +0000 (18:48 +0000)]

Merge changes from topic "am-37557a04-fa85-46fe-a499-4a0280811f3e" into nyc-mr2-dev

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

commit | commitdiff | tree

TreeHugger Robot [Thu, 25 Jan 2018 18:46:43 +0000 (18:46 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

commit | commitdiff | tree

TreeHugger Robot [Thu, 25 Jan 2018 18:46:43 +0000 (18:46 +0000)]

Merge changes from topic "am-6a9a8997-43fc-40a2-827f-5f1c575c8748" into nyc-mr2-dev

* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: 2c3e611a18
Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Thu, 25 Jan 2018 18:44:49 +0000 (18:44 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

commit | commitdiff | tree

TreeHugger Robot [Thu, 25 Jan 2018 18:44:49 +0000 (18:44 +0000)]

Merge changes from topic "am-459a2298-9d91-42be-bcee-e19446619a42" into nyc-mr2-dev

* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: 4cd0777c01
Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Thu, 25 Jan 2018 18:40:29 +0000 (18:40 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

commit | commitdiff | tree

TreeHugger Robot [Thu, 25 Jan 2018 18:40:29 +0000 (18:40 +0000)]

Merge changes from topic "am-3ca94091-64c7-4524-a9e7-1438a5fc6599" into nyc-mr2-dev

* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: 9a738cccdb
Import translations. DO NOT MERGE

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 25 Jan 2018 14:28:57 +0000 (14:28 +0000)]

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

Change-Id: I817002a824ff75c6764d45d3738518c1603a00ba

commit | commitdiff | tree

Bill Yi [Thu, 25 Jan 2018 14:28:41 +0000 (06:28 -0800)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 25 Jan 2018 14:23:07 +0000 (14:23 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 9a738cccdb

Change-Id: Iae0ea1e87448360321f506ca698d19b5b7812498

commit | commitdiff | tree

Bill Yi [Thu, 25 Jan 2018 14:22:37 +0000 (06:22 -0800)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 25 Jan 2018 13:30:47 +0000 (13:30 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 816ddbdba7

Change-Id: I7914f49de4bd92832326b43b8f87b684bb5df85a

frameworks/base

About OSDN

Find Software

Develop Software

Help

Copyright ©OSDN Corporation All rights reserved.