OSDN Git Service

android-x86/frameworks-base.git
6 years ago[automerger] Update internal ViewPager's SavedState to match Support Library version...
Android Build Merger (Role) [Fri, 16 Feb 2018 19:46:03 +0000 (19:46 +0000)]
[automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0 am: cb362192e8 am: bc42f76941 am: c42091667c

Change-Id: Ia150bf95186b1a7acdec0d723d44f33040951f56

6 years ago[automerger] Update internal ViewPager's SavedState to match Support Library version...
Android Build Merger (Role) [Fri, 16 Feb 2018 19:45:57 +0000 (19:45 +0000)]
[automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0 am: cb362192e8 am: bc42f76941

Change-Id: Id69b35c6cc53b6cea1666d724813ae21634c0b4c

6 years ago[automerger] Update internal ViewPager's SavedState to match Support Library version...
Android Build Merger (Role) [Fri, 16 Feb 2018 19:45:41 +0000 (19:45 +0000)]
[automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0 am: cb362192e8

Change-Id: Ie379f04b1e570ebc94a9e5c37ab3ddbf469acb93

6 years ago[automerger] Update internal ViewPager's SavedState to match Support Library version...
Android Build Merger (Role) [Fri, 16 Feb 2018 19:45:36 +0000 (19:45 +0000)]
[automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0

Change-Id: Ie54af74e2ab273be07c4cd73881010ee952997ef

6 years ago[automerger] Update internal ViewPager's SavedState to match Support Library version...
Android Build Merger (Role) [Fri, 16 Feb 2018 19:45:30 +0000 (19:45 +0000)]
[automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831

Change-Id: I33e06bfcad6941fd8845f443991dfbcbd4167348

6 years ago[automerger] Update internal ViewPager's SavedState to match Support Library version...
Android Build Merger (Role) [Fri, 16 Feb 2018 19:45:24 +0000 (19:45 +0000)]
[automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1

Change-Id: Ia2d011a3e2c705e82ab11dbf571f6f52cf05bae8

6 years agoUpdate internal ViewPager's SavedState to match Support Library version
Alan Viverette [Fri, 16 Feb 2018 18:56:02 +0000 (13:56 -0500)]
Update internal ViewPager's SavedState to match Support Library version

Merged-In: Ic4569b21d8a26a62bba91742b442f0c3ea8bcc9e
Change-Id: I17d085be9ce1a139e75264f1e715df7f565cd41b
Fixes: 71992105
Test: manual

6 years ago[automerger] DO NOT MERGE Fix mTrustManager NPE am: a381c4ced3 am: 30a705874a am...
Android Build Merger (Role) [Thu, 15 Feb 2018 00:06:07 +0000 (00:06 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am: a381c4ced3 am: 30a705874a am: 85727109f0 skipped: 15a3e59d35 am: 0a2ed3f761 am: d57766c5b4

Change-Id: Iac5a694469e6c111f204df6c58446a45cf0ada7c

6 years ago[automerger] DO NOT MERGE Fix mTrustManager NPE am: a381c4ced3 am: 30a705874a am...
Android Build Merger (Role) [Thu, 15 Feb 2018 00:06:02 +0000 (00:06 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am: a381c4ced3 am: 30a705874a am: 85727109f0 skipped: 15a3e59d35 am: 0a2ed3f761

Change-Id: Ie5d077cba11b7b9277f4fbce046e571a01535c3c

6 years ago[automerger] DO NOT MERGE Fix mTrustManager NPE am: a381c4ced3 am: 30a705874a am...
Android Build Merger (Role) [Thu, 15 Feb 2018 00:05:54 +0000 (00:05 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am: a381c4ced3 am: 30a705874a am: 85727109f0 skipped: 15a3e59d35

Change-Id: If169e52215ed3a3428d4ff4e834f635f7b0f30e1

6 years ago[automerger] DO NOT MERGE Fix mTrustManager NPE am: a381c4ced3 am: 30a705874a am...
Android Build Merger (Role) [Thu, 15 Feb 2018 00:05:49 +0000 (00:05 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am: a381c4ced3 am: 30a705874a am: 85727109f0

Change-Id: I80463ee5315c2672e812659192b227c8271e9113

6 years ago[automerger] DO NOT MERGE Fix mTrustManager NPE am: a381c4ced3 am: 30a705874a
Android Build Merger (Role) [Thu, 15 Feb 2018 00:05:43 +0000 (00:05 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am: a381c4ced3 am: 30a705874a

Change-Id: Ic83a666bae330bea031b95233079e1493c02c9b3

6 years ago[automerger] DO NOT MERGE Fix mTrustManager NPE am: a381c4ced3
Android Build Merger (Role) [Thu, 15 Feb 2018 00:05:38 +0000 (00:05 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am: a381c4ced3

Change-Id: Ib622af453781a1769e820c10d6ab46c140809c57

6 years ago[automerger] Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into...
Android Build Merger (Role) [Thu, 8 Feb 2018 00:16:09 +0000 (00:16 +0000)]
[automerger] Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-dev am: fa72a625cc am: cdc187ee10

Change-Id: I75f04f568669d0a09e7b492cc2cbcad8bd80389b

6 years agoMerge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-dev
Etan Cohen [Thu, 8 Feb 2018 00:15:28 +0000 (00:15 +0000)]
Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-dev
am: fa72a625cc

Change-Id: I99bcbd911edac1d5089e510b888c665f02dc881c

6 years agoMerge "Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dr1...
Android Build Merger (Role) [Wed, 7 Feb 2018 23:49:05 +0000 (23:49 +0000)]
Merge "Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dr1-dev am: 4feca3b99f" into nyc-mr1-dev

6 years agoMerge "Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dev...
Android Build Merger (Role) [Wed, 7 Feb 2018 23:46:50 +0000 (23:46 +0000)]
Merge "Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dev am: 47f4b8411f" into nyc-dr1-dev

6 years agoMerge changes from topic "am-ef8b8c56c2ad450fb6fab355f35597b0" into nyc-mr1-dev
Android Build Merger (Role) [Wed, 7 Feb 2018 23:46:50 +0000 (23:46 +0000)]
Merge changes from topic "am-ef8b8c56c2ad450fb6fab355f35597b0" into nyc-mr1-dev

* changes:
  [automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dev am: 47f4b8411f am: e1ea5d3df1
  Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dev am: 47f4b8411f

6 years agoMerge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dr1-dev
Etan Cohen [Wed, 7 Feb 2018 23:45:55 +0000 (23:45 +0000)]
Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dr1-dev
am: 4feca3b99f

Change-Id: Id02665871c6b93b03fa1294278e3cb8513811b5e

6 years agoMerge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-dev
Android Build Merger (Role) [Wed, 7 Feb 2018 23:45:18 +0000 (23:45 +0000)]
Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-dev

* changes:
  [automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev am: 84118c127f am: c975948988
  Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev am: 84118c127f

6 years agoMerge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-dr1-dev
Android Build Merger (Role) [Wed, 7 Feb 2018 23:45:18 +0000 (23:45 +0000)]
Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-dr1-dev

* changes:
  [automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev am: 84118c127f am: c975948988 am: b8abffa008
  [automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev am: 84118c127f am: c975948988
  Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev am: 84118c127f

6 years agoMerge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-mr1-dev
Android Build Merger (Role) [Wed, 7 Feb 2018 23:45:18 +0000 (23:45 +0000)]
Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-mr1-dev

* changes:
  [automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev am: 84118c127f am: c975948988 am: b8abffa008 am: 74c421f08a
  [automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev am: 84118c127f am: c975948988 am: b8abffa008
  [automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev am: 84118c127f am: c975948988
  Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev am: 84118c127f

6 years ago[automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into...
Android Build Merger (Role) [Wed, 7 Feb 2018 23:45:07 +0000 (23:45 +0000)]
[automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dev am: 47f4b8411f am: e1ea5d3df1

Change-Id: Ie3405b9e4ff95c8974e9a7f08ca949112b161002

6 years agoMerge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dev
Etan Cohen [Wed, 7 Feb 2018 23:44:04 +0000 (23:44 +0000)]
Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dev
am: 47f4b8411f

Change-Id: Idb749103a54c357be2b17081c52265ca54426677

6 years ago[automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12...
Android Build Merger (Role) [Wed, 7 Feb 2018 23:41:31 +0000 (23:41 +0000)]
[automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev am: 84118c127f am: c975948988 am: b8abffa008 am: 74c421f08a

Change-Id: I5b9852908336603c83c9318229a3d8fe891f7a9b

6 years ago[automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into...
Android Build Merger (Role) [Wed, 7 Feb 2018 23:41:13 +0000 (23:41 +0000)]
[automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into mnc-dr1.5-dev am: eac0551992 am: 196b64c28c am: af8b7b859a

Change-Id: I01648d7eb843c440c7b72ec26e35a9aee60eeff0

6 years ago[automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12...
Android Build Merger (Role) [Wed, 7 Feb 2018 23:40:59 +0000 (23:40 +0000)]
[automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev am: 84118c127f am: c975948988 am: b8abffa008

Change-Id: I7e4aa757fe6447cc2bca1134e4406123e1ec3546

6 years ago[automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into...
Android Build Merger (Role) [Wed, 7 Feb 2018 23:40:06 +0000 (23:40 +0000)]
[automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into mnc-dr1.5-dev am: eac0551992 am: 196b64c28c

Change-Id: I88db62bf864dfd51d8efe1e445fe953c17d684d9

6 years ago[automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12...
Android Build Merger (Role) [Wed, 7 Feb 2018 23:39:56 +0000 (23:39 +0000)]
[automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev am: 84118c127f am: c975948988

Change-Id: I2e6188de2f8814f2f75efe5000013c5636bc154a

6 years agoMerge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into mnc-dr1.5-dev
Etan Cohen [Wed, 7 Feb 2018 23:39:34 +0000 (23:39 +0000)]
Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into mnc-dr1.5-dev
am: eac0551992

Change-Id: Ia7fedd1202e9250d27d16dc3327b7664b134ae1f

6 years agoMerge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc...
Etan Cohen [Wed, 7 Feb 2018 23:39:13 +0000 (23:39 +0000)]
Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev
am: 84118c127f

Change-Id: Id813276417c71446dd2ac8d146888297e5a6c89c

6 years agoMerge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc...
Android Build Merger (Role) [Wed, 7 Feb 2018 23:32:32 +0000 (23:32 +0000)]
Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-dr1-dev am: c157934e61" into nyc-mr1-dev

6 years agoMerge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc...
Android Build Merger (Role) [Wed, 7 Feb 2018 23:30:18 +0000 (23:30 +0000)]
Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-dev am: f780227541" into nyc-dr1-dev

6 years ago[automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into...
Android Build Merger (Role) [Wed, 7 Feb 2018 23:28:23 +0000 (23:28 +0000)]
[automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-dev am: f780227541 am: f4e8657a0e

Change-Id: I56732739223c1b8030a1bfb4e50713fe0cc82a41

6 years agoMerge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-dr1-dev
Etan Cohen [Wed, 7 Feb 2018 23:28:18 +0000 (23:28 +0000)]
Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-dr1-dev
am: c157934e61

Change-Id: I6f6de560c3dfcdb84d03f6014ccc12fa9a30af03

6 years agoMerge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-dev
Etan Cohen [Wed, 7 Feb 2018 23:27:44 +0000 (23:27 +0000)]
Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-dev
am: f780227541

Change-Id: I853c049eee96bb6b06cdc98f540e779761e946f3

6 years agoMerge changes from topic "am-922cd235076540bdb5f01e7024397331" into nyc-dev
Android Build Merger (Role) [Wed, 7 Feb 2018 23:27:41 +0000 (23:27 +0000)]
Merge changes from topic "am-922cd235076540bdb5f01e7024397331" into nyc-dev

* changes:
  [automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into cw-e-dev am: 6cc0b76e85 am: c8d99435c1
  Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into cw-e-dev am: 6cc0b76e85

6 years agoMerge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into cw...
Android Build Merger (Role) [Wed, 7 Feb 2018 23:27:41 +0000 (23:27 +0000)]
Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into cw-e-dev am: 6cc0b76e85" into mnc-dr1.5-dev

6 years agoMerge changes from topic "am-922cd235076540bdb5f01e7024397331" into nyc-dr1-dev
Android Build Merger (Role) [Wed, 7 Feb 2018 23:27:41 +0000 (23:27 +0000)]
Merge changes from topic "am-922cd235076540bdb5f01e7024397331" into nyc-dr1-dev

* changes:
  [automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into cw-e-dev am: 6cc0b76e85 am: c8d99435c1 am: 117c674e9e
  [automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into cw-e-dev am: 6cc0b76e85 am: c8d99435c1
  Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into cw-e-dev am: 6cc0b76e85

6 years agoMerge changes from topic "am-922cd235076540bdb5f01e7024397331" into nyc-mr1-dev
Android Build Merger (Role) [Wed, 7 Feb 2018 23:27:41 +0000 (23:27 +0000)]
Merge changes from topic "am-922cd235076540bdb5f01e7024397331" into nyc-mr1-dev

* changes:
  [automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into cw-e-dev am: 6cc0b76e85 am: c8d99435c1 am: 117c674e9e am: 120c7a74e9
  [automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into cw-e-dev am: 6cc0b76e85 am: c8d99435c1 am: 117c674e9e
  [automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into cw-e-dev am: 6cc0b76e85 am: c8d99435c1
  Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into cw-e-dev am: 6cc0b76e85

6 years agoMerge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc...
Android Build Merger (Role) [Wed, 7 Feb 2018 23:27:31 +0000 (23:27 +0000)]
Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr1.5-dev am: 1c198dfc71" into nyc-dev

6 years agoMerge changes from topic "am-5525892b4ae143f49ddb25efbc5582ff" into nyc-dr1-dev
Android Build Merger (Role) [Wed, 7 Feb 2018 23:27:31 +0000 (23:27 +0000)]
Merge changes from topic "am-5525892b4ae143f49ddb25efbc5582ff" into nyc-dr1-dev

* changes:
  [automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr1.5-dev am: 1c198dfc71 am: dae4e83eaf
  Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr1.5-dev am: 1c198dfc71

6 years agoMerge changes from topic "am-5525892b4ae143f49ddb25efbc5582ff" into nyc-mr1-dev
Android Build Merger (Role) [Wed, 7 Feb 2018 23:27:31 +0000 (23:27 +0000)]
Merge changes from topic "am-5525892b4ae143f49ddb25efbc5582ff" into nyc-mr1-dev

* changes:
  [automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr1.5-dev am: 1c198dfc71 am: dae4e83eaf am: aef43d6eb2
  [automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr1.5-dev am: 1c198dfc71 am: dae4e83eaf
  Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr1.5-dev am: 1c198dfc71

6 years agoMerge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc...
Android Build Merger (Role) [Wed, 7 Feb 2018 23:26:32 +0000 (23:26 +0000)]
Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev

6 years agoMerge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dr1-dev
Android Build Merger (Role) [Wed, 7 Feb 2018 23:26:32 +0000 (23:26 +0000)]
Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dr1-dev

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

6 years agoMerge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dev
Android Build Merger (Role) [Wed, 7 Feb 2018 23:26:32 +0000 (23:26 +0000)]
Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dev

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

6 years agoMerge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into mnc-dr1.5-dev
Android Build Merger (Role) [Wed, 7 Feb 2018 23:26:32 +0000 (23:26 +0000)]
Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into mnc-dr1.5-dev

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

6 years agoMerge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-mr1-dev
Android Build Merger (Role) [Wed, 7 Feb 2018 23:26:32 +0000 (23:26 +0000)]
Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-mr1-dev

* changes:
  [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
  [automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad am: 523fed0deb am: 04e84bb0ec am: 0dcedd2073
  [automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad am: 523fed0deb am: 04e84bb0ec
  [automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad am: 523fed0deb
  Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad

6 years ago[automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into...
Android Build Merger (Role) [Wed, 7 Feb 2018 23:26:07 +0000 (23:26 +0000)]
[automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into cw-e-dev am: 6cc0b76e85 am: c8d99435c1 am: 117c674e9e am: 120c7a74e9

Change-Id: Icf4d2c8532e35a7d3f469f76637f7e3049c97626

6 years ago[automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into...
Android Build Merger (Role) [Wed, 7 Feb 2018 23:26:07 +0000 (23:26 +0000)]
[automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr1.5-dev am: 1c198dfc71 am: dae4e83eaf am: aef43d6eb2

Change-Id: I89aaa744a375f13466bf7bbf41ef1b7bb5dd3395

6 years ago[automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into...
Android Build Merger (Role) [Wed, 7 Feb 2018 23:26:02 +0000 (23:26 +0000)]
[automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into cw-e-dev am: 6cc0b76e85 am: c8d99435c1 am: 117c674e9e

Change-Id: I1fd6fa75b345a810ae53784b5b56004927cc35a9

6 years ago[automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into...
Android Build Merger (Role) [Wed, 7 Feb 2018 23:25:57 +0000 (23:25 +0000)]
[automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr1.5-dev am: 1c198dfc71 am: dae4e83eaf

Change-Id: I42a1eb239f491eb2c52db802b0b7cd8de9807b13

6 years ago[automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into...
Android Build Merger (Role) [Wed, 7 Feb 2018 23:25:50 +0000 (23:25 +0000)]
[automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into cw-e-dev am: 6cc0b76e85 am: c8d99435c1

Change-Id: I694605b85bb5b5d123663c7fe670274cb2e15f36

6 years agoMerge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr1.5-dev
Etan Cohen [Wed, 7 Feb 2018 23:25:20 +0000 (23:25 +0000)]
Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr1.5-dev
am: 1c198dfc71

Change-Id: I26d40e2d2dd918f8dbe7b8b688f2834808c240c2

6 years agoMerge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into cw-e-dev
Etan Cohen [Wed, 7 Feb 2018 23:24:45 +0000 (23:24 +0000)]
Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into cw-e-dev
am: 6cc0b76e85

Change-Id: Ic11f51471318d3343024226f3bc282e35f9d6346

6 years ago[automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into...
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

6 years ago[automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into...
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

6 years ago[automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into...
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

6 years ago[automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into...
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

6 years agoMerge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev
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

6 years ago[automerger] Merge "[RTT] ParcelableRttResults parcel code fix" into mnc-dev am:...
Android Build Merger (Role) [Wed, 7 Feb 2018 23:22:19 +0000 (23:22 +0000)]
[automerger] Merge "[RTT] ParcelableRttResults parcel code fix" into mnc-dev am: e137462b2c am: 15754b34be am: c3fc912374 am: 0c37ab30a1 am: def8c23fb5 am: 2367a1a63e

Change-Id: I4431d2adcde5e2c1308a48a90a01d9e324b2c5cd

6 years ago[automerger] Merge "[RTT] ParcelableRttResults parcel code fix" into mnc-dev am:...
Android Build Merger (Role) [Wed, 7 Feb 2018 23:22:14 +0000 (23:22 +0000)]
[automerger] Merge "[RTT] ParcelableRttResults parcel code fix" into mnc-dev am: e137462b2c am: 15754b34be am: c3fc912374 am: 0c37ab30a1 am: def8c23fb5

Change-Id: I8732629d97566fe507b87e333dc2a7ce562c7b38

6 years ago[automerger] Merge "[RTT] ParcelableRttResults parcel code fix" into mnc-dev am:...
Android Build Merger (Role) [Wed, 7 Feb 2018 23:21:59 +0000 (23:21 +0000)]
[automerger] Merge "[RTT] ParcelableRttResults parcel code fix" into mnc-dev am: e137462b2c am: 15754b34be am: c3fc912374 am: 0c37ab30a1

Change-Id: I5d1adb5f7d6d5eb3ba584033453bf4766b5fd300

6 years ago[automerger] Merge "[RTT] ParcelableRttResults parcel code fix" into mnc-dev am:...
Android Build Merger (Role) [Wed, 7 Feb 2018 23:21:52 +0000 (23:21 +0000)]
[automerger] Merge "[RTT] ParcelableRttResults parcel code fix" into mnc-dev am: e137462b2c am: 15754b34be am: c3fc912374

Change-Id: I9a94eac5fa1b832b4334e08676b2be7a032c3efc

6 years ago[automerger] Merge "[RTT] ParcelableRttResults parcel code fix" into mnc-dev am:...
Android Build Merger (Role) [Wed, 7 Feb 2018 23:21:42 +0000 (23:21 +0000)]
[automerger] Merge "[RTT] ParcelableRttResults parcel code fix" into mnc-dev am: e137462b2c am: 15754b34be

Change-Id: Idfec393662af2392aba6949d7ffcad720b4d4eb6

6 years agoMerge "[RTT] ParcelableRttResults parcel code fix" into mnc-dev
Etan Cohen [Wed, 7 Feb 2018 23:21:17 +0000 (23:21 +0000)]
Merge "[RTT] ParcelableRttResults parcel code fix" into mnc-dev
am: e137462b2c

Change-Id: I4132c2ccfc0db161c6a89a6c62fb276f0874d39b

6 years agoMerge "[RTT] ParcelableRttResults parcel code fix" into mnc-dev
Etan Cohen [Wed, 7 Feb 2018 22:41:26 +0000 (22:41 +0000)]
Merge "[RTT] ParcelableRttResults parcel code fix" into mnc-dev

6 years agoMerge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-mr1-dev
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

6 years agoMerge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-dr1-dev
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

6 years agoMerge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-dev
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

6 years agoMerge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr1.5-dev
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

6 years agoMerge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into cw-e-dev
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

6 years agoMerge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev
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

6 years ago[automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888 am: 0231bc4d...
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

6 years ago[automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888 am: 0231bc4d...
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

6 years ago[automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888 am: 0231bc4d...
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

6 years ago[automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888 am: 0231bc4d...
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

6 years ago[automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888 am: 0231bc4d6d
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

6 years ago[automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888
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

6 years agoFix VerifyCredentialResponse parcelling code
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

6 years ago[automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4...
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

6 years ago[automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4...
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

6 years ago[automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4...
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

6 years ago[automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4...
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

6 years ago[automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4
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

6 years ago[automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c
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

6 years ago[RTT] ParcelableRttResults parcel code fix
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

6 years ago[automerger] Merge "Adjust URI host parsing to stop on \ character." into lmp-mr1...
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

6 years ago[automerger] Merge "Adjust URI host parsing to stop on \ character." into lmp-mr1...
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

6 years ago[automerger] Merge "Adjust URI host parsing to stop on \ character." into lmp-mr1...
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

6 years ago[automerger] Merge "Adjust URI host parsing to stop on \ character." into lmp-mr1...
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

6 years ago[automerger] Merge "Adjust URI host parsing to stop on \ character." into lmp-mr1...
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

6 years ago[automerger] Merge "Adjust URI host parsing to stop on \ character." into lmp-mr1...
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

6 years agoMerge "Adjust URI host parsing to stop on \ character." into lmp-mr1-dev
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

6 years ago[automerger] Merge changes from topic "am-f1eb5cc5-7ac1-4540-b9cf-e0577f9334e7" into...
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

6 years ago[automerger] Merge changes from topic "am-f1eb5cc5-7ac1-4540-b9cf-e0577f9334e7" into...
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

6 years ago[automerger] Merge changes from topic "am-f1eb5cc5-7ac1-4540-b9cf-e0577f9334e7" into...
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

6 years ago[automerger] Merge changes from topic "am-f1eb5cc5-7ac1-4540-b9cf-e0577f9334e7" into...
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

6 years agoMerge changes from topic "am-f1eb5cc5-7ac1-4540-b9cf-e0577f9334e7" into mnc-dr-dev
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

6 years agoMerge changes from topic "am-f1eb5cc5-7ac1-4540-b9cf-e0577f9334e7" into mnc-dr-dev
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.