OSDN Git Service

android-x86/frameworks-base.git
6 years agoMerge "Merge changes from topic "am-02bffa5d2f4a4860b898fa67a751a8f5" into nyc-mr2...
Etan Cohen [Thu, 8 Feb 2018 09:17:38 +0000 (09:17 +0000)]
Merge "Merge changes from topic "am-02bffa5d2f4a4860b898fa67a751a8f5" into nyc-mr2-dev am: 39e6bc7495" into oc-dev am: d0adbcb4e2 am: 655059b334
am: e5058056f4

Change-Id: I7be1aff3d71535f93b06adff2a196a32d320bb1b

6 years ago[automerger] Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into...
Etan Cohen [Thu, 8 Feb 2018 08:51:33 +0000 (08:51 +0000)]
[automerger] Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-mr1-dev am: bd629f69ed am: 1d10387f0d am: 7f4440640b am: 5c777fbcef am: fa6d41a295
am: 2fc3c754c6

Change-Id: I2a9bd8f1cad36631e18c92e59e2ee72a231354c7

6 years agoMerge "Merge changes from topic "am-02bffa5d2f4a4860b898fa67a751a8f5" into nyc-mr2...
Etan Cohen [Thu, 8 Feb 2018 08:35:03 +0000 (08:35 +0000)]
Merge "Merge changes from topic "am-02bffa5d2f4a4860b898fa67a751a8f5" into nyc-mr2-dev am: 39e6bc7495" into oc-dev am: d0adbcb4e2
am: 655059b334

Change-Id: I15de97114e5e3ac7c2ff24c0c7c4c4a9dddd89cc

6 years agoMerge changes from topic "am-075f69afbbda4610b4adfcdcb0fd78fc" into oc-dev am: 8e5ec1...
Etan Cohen [Thu, 8 Feb 2018 08:22:52 +0000 (08:22 +0000)]
Merge changes from topic "am-075f69afbbda4610b4adfcdcb0fd78fc" into oc-dev am: 8e5ec12799 am: b6eed228bc
am: 557941309a

Change-Id: Ie1f3b458f779c0fe2e1d4bcd98079c5d7d0de254

6 years agoMerge "Merge changes from topic "am-02bffa5d2f4a4860b898fa67a751a8f5" into nyc-mr2...
Etan Cohen [Thu, 8 Feb 2018 08:07:30 +0000 (08:07 +0000)]
Merge "Merge changes from topic "am-02bffa5d2f4a4860b898fa67a751a8f5" into nyc-mr2-dev am: 39e6bc7495" into oc-dev
am: d0adbcb4e2

Change-Id: I287c62a8b83662ba112809ce2aa07c5a3f04fb6d

6 years ago[automerger] Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into...
Etan Cohen [Thu, 8 Feb 2018 07:59:23 +0000 (07:59 +0000)]
[automerger] Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-mr1-dev am: bd629f69ed am: 1d10387f0d am: 7f4440640b am: 5c777fbcef
am: fa6d41a295

Change-Id: Iae246cb8b7601877b4d74b2940ca01847cae5a4c

6 years ago[automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into...
Etan Cohen [Thu, 8 Feb 2018 07:58:57 +0000 (07:58 +0000)]
[automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dr1-dev am: 4feca3b99f am: b164f1dce0 am: 651db1820d am: 024efb4645 am: c9e1d843b2 am: a5802150c4
am: bb074ffe22

Change-Id: Id5a2f9e75805e6bbffdec4efb6c3cc21629f139a

6 years agoMerge changes from topic "am-075f69afbbda4610b4adfcdcb0fd78fc" into oc-dev am: 8e5ec12799
Etan Cohen [Thu, 8 Feb 2018 07:34:43 +0000 (07:34 +0000)]
Merge changes from topic "am-075f69afbbda4610b4adfcdcb0fd78fc" into oc-dev am: 8e5ec12799
am: b6eed228bc

Change-Id: I3928e7364f73369f86fbddbb5d23ecdb57c235cd

6 years ago[automerger] Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into...
Etan Cohen [Thu, 8 Feb 2018 07:30:43 +0000 (07:30 +0000)]
[automerger] Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-mr1-dev am: bd629f69ed am: 1d10387f0d am: 7f4440640b
am: 5c777fbcef

Change-Id: Ib7e482deaac700c58a8cf9fc9514c3890b3e7d9b

6 years agoMerge changes from topic "am-ef8b8c56c2ad450fb6fab355f35597b0" into oc-dev am: 4839fb...
Etan Cohen [Thu, 8 Feb 2018 07:30:01 +0000 (07:30 +0000)]
Merge changes from topic "am-ef8b8c56c2ad450fb6fab355f35597b0" into oc-dev am: 4839fb4abd am: beef47bfee
am: 3da59c5940

Change-Id: I8f114ec9baea79623dce7f211571fcc8ddf56174

6 years ago[automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into...
Etan Cohen [Thu, 8 Feb 2018 07:09:48 +0000 (07:09 +0000)]
[automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dr1-dev am: 4feca3b99f am: b164f1dce0 am: 651db1820d am: 024efb4645 am: c9e1d843b2
am: a5802150c4

Change-Id: Ieccbb5238167cb3853f09f647d3ef49cdd02c5f1

6 years agoMerge changes from topic "am-075f69afbbda4610b4adfcdcb0fd78fc" into oc-dev
Etan Cohen [Thu, 8 Feb 2018 07:09:02 +0000 (07:09 +0000)]
Merge changes from topic "am-075f69afbbda4610b4adfcdcb0fd78fc" into oc-dev
am: 8e5ec12799

Change-Id: I3eed03bdd6515f32bb419fee9a9f9af9367ab424

6 years agoMerge changes from topic "am-513301705eec406eb3be13d14037bb53" into oc-dev am: 827eb7...
Etan Cohen [Thu, 8 Feb 2018 07:01:24 +0000 (07:01 +0000)]
Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into oc-dev am: 827eb741d7 am: 03c97d0a92
am: f75de43ec4

Change-Id: Ia101af66bfc163a4476e43c2e801f0147c0d5d6e

6 years agoMerge changes from topic "am-ef8b8c56c2ad450fb6fab355f35597b0" into oc-dev am: 4839fb4abd
Etan Cohen [Thu, 8 Feb 2018 06:46:44 +0000 (06:46 +0000)]
Merge changes from topic "am-ef8b8c56c2ad450fb6fab355f35597b0" into oc-dev am: 4839fb4abd
am: beef47bfee

Change-Id: I3792100af3d64b1ee520b0403ddfdb5198dee346

6 years ago[automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into...
Etan Cohen [Thu, 8 Feb 2018 06:34:06 +0000 (06:34 +0000)]
[automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dr1-dev am: 4feca3b99f am: b164f1dce0 am: 651db1820d am: 024efb4645
am: c9e1d843b2

Change-Id: I28ecedebcea9fdac3858626cdac2c0a2bc8925f5

6 years ago[automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into...
Etan Cohen [Thu, 8 Feb 2018 06:31:48 +0000 (06:31 +0000)]
[automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into mnc-dr1.5-dev am: eac0551992 am: 196b64c28c am: af8b7b859a am: 25b8c8b3fb am: c290ad3333 am: b26a010054 am: 000e6625c4 am: 7bd058e35e
am: 04a707b5f2

Change-Id: I0c8f651c09d06a0c5664bc64b17f048cc3ffa446

6 years agoMerge changes from topic "am-513301705eec406eb3be13d14037bb53" into oc-dev am: 827eb741d7
Etan Cohen [Thu, 8 Feb 2018 06:21:54 +0000 (06:21 +0000)]
Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into oc-dev am: 827eb741d7
am: 03c97d0a92

Change-Id: I80025b0036a7d9b5a77e3807bff44ef22aa898d2

6 years agoMerge changes from topic "am-ef8b8c56c2ad450fb6fab355f35597b0" into oc-dev
Etan Cohen [Thu, 8 Feb 2018 06:13:44 +0000 (06:13 +0000)]
Merge changes from topic "am-ef8b8c56c2ad450fb6fab355f35597b0" into oc-dev
am: 4839fb4abd

Change-Id: I330f9c4e3732d4655e294d6ad2c1ab120ce10b10

6 years agoMerge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc...
Etan Cohen [Thu, 8 Feb 2018 06:06:39 +0000 (06:06 +0000)]
Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-mr2-dev am: e12dda4b7c" into oc-dev am: 08833f4f58 am: f28aa657bc
am: 13635e0177

Change-Id: I117e1e30a985ae8e7a07a7f2f7957878b6cc7414

6 years ago[automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into...
Etan Cohen [Thu, 8 Feb 2018 05:57:25 +0000 (05:57 +0000)]
[automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into mnc-dr1.5-dev am: eac0551992 am: 196b64c28c am: af8b7b859a am: 25b8c8b3fb am: c290ad3333 am: b26a010054 am: 000e6625c4
am: 7bd058e35e

Change-Id: Ibd656fd5a759fc864868da09e3b63bc2fadf204a

6 years agoMerge changes from topic "am-513301705eec406eb3be13d14037bb53" into oc-dev
Etan Cohen [Thu, 8 Feb 2018 05:40:11 +0000 (05:40 +0000)]
Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into oc-dev
am: 827eb741d7

Change-Id: Ic35c752cb5435d00eb91df8e296a433e859c3afc

6 years agoMerge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc...
Etan Cohen [Thu, 8 Feb 2018 05:39:35 +0000 (05:39 +0000)]
Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-mr2-dev am: e12dda4b7c" into oc-dev am: 08833f4f58
am: f28aa657bc

Change-Id: Ib65b042822db0543d122bcdde18464617b60c6ab

6 years agoMerge changes from topic "am-dac98ec1428b47c5bf6a45c28771bf33" into oc-dev am: 2ef926...
Etan Cohen [Thu, 8 Feb 2018 05:21:14 +0000 (05:21 +0000)]
Merge changes from topic "am-dac98ec1428b47c5bf6a45c28771bf33" into oc-dev am: 2ef9262f9a am: e7a0ce2afa
am: beba3a40c5

Change-Id: Ibba0785249088330d4477aecdabc1fd638dda5af

6 years ago[automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into...
Etan Cohen [Thu, 8 Feb 2018 05:08:37 +0000 (05:08 +0000)]
[automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into mnc-dr1.5-dev am: eac0551992 am: 196b64c28c am: af8b7b859a am: 25b8c8b3fb am: c290ad3333 am: b26a010054
am: 000e6625c4

Change-Id: Ic3a04af34c060c3d1e18c95a984cacaeba17f5b5

6 years agoMerge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc...
Etan Cohen [Thu, 8 Feb 2018 04:51:05 +0000 (04:51 +0000)]
Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-mr2-dev am: e12dda4b7c" into oc-dev
am: 08833f4f58

Change-Id: I5c61df4ec8100ae5c34e319f1ced7ae5f57e1ba7

6 years ago[automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into...
Etan Cohen [Thu, 8 Feb 2018 04:46:01 +0000 (04:46 +0000)]
[automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-mr1-dev am: a6d45d9768 am: c2f948ccc1 am: 4c4cf86e9d am: 7179a3425c am: 2fe9543fda
am: 02a661909c

Change-Id: I295ca4caca66544180902c4ef548c7987f5bbaa2

6 years agoMerge changes from topic "am-dac98ec1428b47c5bf6a45c28771bf33" into oc-dev am: 2ef9262f9a
Etan Cohen [Thu, 8 Feb 2018 04:45:56 +0000 (04:45 +0000)]
Merge changes from topic "am-dac98ec1428b47c5bf6a45c28771bf33" into oc-dev am: 2ef9262f9a
am: e7a0ce2afa

Change-Id: I337eff8e14e63e9a615a463e6f6d74d71feed7ff

6 years ago[automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into...
Etan Cohen [Thu, 8 Feb 2018 04:19:45 +0000 (04:19 +0000)]
[automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-dev am: f780227541 am: f4e8657a0e am: 2d3b87ce06 am: 5558a64435 am: 484e2c4ea1 am: 3938fca8fa am: a97fcf83f5
am: 64177d4964

Change-Id: If06c7dab2b1f6f3e2638b8f2fdc9b19491700285

6 years agoMerge changes from topic "am-dac98ec1428b47c5bf6a45c28771bf33" into oc-dev
Etan Cohen [Thu, 8 Feb 2018 04:16:52 +0000 (04:16 +0000)]
Merge changes from topic "am-dac98ec1428b47c5bf6a45c28771bf33" into oc-dev
am: 2ef9262f9a

Change-Id: I5323f77b9f57eced0ee22e387a989e4532409235

6 years ago[automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into...
Etan Cohen [Thu, 8 Feb 2018 04:06:02 +0000 (04:06 +0000)]
[automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-mr1-dev am: a6d45d9768 am: c2f948ccc1 am: 4c4cf86e9d am: 7179a3425c
am: 2fe9543fda

Change-Id: I9ac2c6072ecd28550c0da0303f7447480b7d23b6

6 years agoMerge changes from topic "am-922cd235076540bdb5f01e7024397331" into oc-dev am: 889b8f...
Etan Cohen [Thu, 8 Feb 2018 03:54:48 +0000 (03:54 +0000)]
Merge changes from topic "am-922cd235076540bdb5f01e7024397331" into oc-dev am: 889b8f2146 am: efce54b53d
am: 6162ba99b7

Change-Id: Ia20da9f2a97ad14b6f4309fe01794062958712fc

6 years ago[automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into...
Etan Cohen [Thu, 8 Feb 2018 03:46:22 +0000 (03:46 +0000)]
[automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-dev am: f780227541 am: f4e8657a0e am: 2d3b87ce06 am: 5558a64435 am: 484e2c4ea1 am: 3938fca8fa
am: a97fcf83f5

Change-Id: I19e29c96676d5bcf7a20417db76b0ed4501e1f3a

6 years ago[automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into...
Etan Cohen [Thu, 8 Feb 2018 03:41:19 +0000 (03:41 +0000)]
[automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-mr1-dev am: a6d45d9768 am: c2f948ccc1 am: 4c4cf86e9d
am: 7179a3425c

Change-Id: Id872a1a9d460df227fb13f757516a8b1bae36d25

6 years agoMerge changes from topic "am-922cd235076540bdb5f01e7024397331" into oc-dev am: 889b8f2146
Etan Cohen [Thu, 8 Feb 2018 03:28:58 +0000 (03:28 +0000)]
Merge changes from topic "am-922cd235076540bdb5f01e7024397331" into oc-dev am: 889b8f2146
am: efce54b53d

Change-Id: Ied097bdb1385edc2820b80401097bdd3675ee53f

6 years ago[automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into...
Etan Cohen [Thu, 8 Feb 2018 03:21:52 +0000 (03:21 +0000)]
[automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-dev am: f780227541 am: f4e8657a0e am: 2d3b87ce06 am: 5558a64435 am: 484e2c4ea1
am: 3938fca8fa

Change-Id: I1b34feca36d03880f8961e409af8961488e38d4c

6 years agoMerge changes from topic "am-5525892b4ae143f49ddb25efbc5582ff" into oc-dev am: 36fe91...
Etan Cohen [Thu, 8 Feb 2018 03:19:25 +0000 (03:19 +0000)]
Merge changes from topic "am-5525892b4ae143f49ddb25efbc5582ff" into oc-dev am: 36fe919606 am: c9be10b85f
am: bc8cde1353

Change-Id: Ia58a9de6ddbf5f3f5ef28b96a43ef83bda26d80b

6 years agoMerge changes from topic "am-922cd235076540bdb5f01e7024397331" into oc-dev
Etan Cohen [Thu, 8 Feb 2018 03:04:37 +0000 (03:04 +0000)]
Merge changes from topic "am-922cd235076540bdb5f01e7024397331" into oc-dev
am: 889b8f2146

Change-Id: I449caa98d4e760224c727c79e29920a4ca7e5055

6 years agoMerge changes from topic "am-5525892b4ae143f49ddb25efbc5582ff" into oc-dev am: 36fe919606
Etan Cohen [Thu, 8 Feb 2018 02:54:37 +0000 (02:54 +0000)]
Merge changes from topic "am-5525892b4ae143f49ddb25efbc5582ff" into oc-dev am: 36fe919606
am: c9be10b85f

Change-Id: I35caf3e76e9cf7aab89bf346a8571075e834ad64

6 years agoMerge "Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into oc-dev...
Android Build Merger (Role) [Thu, 8 Feb 2018 02:49:52 +0000 (02:49 +0000)]
Merge "Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into oc-dev am: 320ae6c392 am: 72ec6ee567 am: d8c17b81eb" into oc-mr1-dev-plus-aosp

6 years agoMerge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into oc-dev am: 320ae6...
Etan Cohen [Thu, 8 Feb 2018 02:49:27 +0000 (02:49 +0000)]
Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into oc-dev am: 320ae6c392 am: 72ec6ee567
am: d8c17b81eb

Change-Id: I6a0048c7235a3ddea544c0f04111d9a284047d24

6 years agoMerge "Make TelephonyManager#getNai() public" am: 4c8fa81d17
goneil [Thu, 8 Feb 2018 02:40:21 +0000 (02:40 +0000)]
Merge "Make TelephonyManager#getNai() public" am: 4c8fa81d17
am: b731583b7a

Change-Id: Ia251ab0241f2e365556dbd4db663ead53af22d92

6 years agoMerge changes from topic "am-5525892b4ae143f49ddb25efbc5582ff" into oc-dev
Etan Cohen [Thu, 8 Feb 2018 02:29:18 +0000 (02:29 +0000)]
Merge changes from topic "am-5525892b4ae143f49ddb25efbc5582ff" into oc-dev
am: 36fe919606

Change-Id: I27c7213c4d42a99543825a2f66785df2b97d8f01

6 years agoMerge "Make TelephonyManager#getNai() public"
goneil [Thu, 8 Feb 2018 02:21:01 +0000 (02:21 +0000)]
Merge "Make TelephonyManager#getNai() public"
am: 4c8fa81d17

Change-Id: Ie219d338df42cf4593545180691759426616ade4

6 years agoMerge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into oc-dev am: 320ae6c392
Etan Cohen [Thu, 8 Feb 2018 02:19:40 +0000 (02:19 +0000)]
Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into oc-dev am: 320ae6c392
am: 72ec6ee567

Change-Id: Idd143a0e350d035b8f401547bf7809a23c9f0a93

6 years ago[automerger] Merge "[RTT] ParcelableRttResults parcel code fix" into mnc-dev am:...
Etan Cohen [Thu, 8 Feb 2018 01:57:02 +0000 (01:57 +0000)]
[automerger] Merge "[RTT] ParcelableRttResults parcel code fix" into mnc-dev am: e137462b2c am: 15754b34be am: c3fc912374 am: 0c37ab30a1 am: def8c23fb5 am: 2367a1a63e am: ec3b2c4683 am: bde11f2314 am: 71bb27a3da am: ff94c32675 am: 1c490515bd
am: 7c4da1ce2b

Change-Id: I07b03c420bb55f3b5136f316fa8e58316ba5deac

6 years agoMerge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into oc-dev
Etan Cohen [Thu, 8 Feb 2018 01:55:04 +0000 (01:55 +0000)]
Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into oc-dev
am: 320ae6c392

Change-Id: Ic16f826b5ea55bd5c5050468b45bef454385b3ac

6 years agoMerge "Handle onBindingDied in notification manager" into oc-mr1-dev
Ryan Lothian [Thu, 8 Feb 2018 01:37:16 +0000 (01:37 +0000)]
Merge "Handle onBindingDied in notification manager" into oc-mr1-dev
am: f638a39149

Change-Id: If5aedb5832ece597bd9138bae9c0fd5ba1851f4a

6 years agoMerge "IMS: Add support in frameworks for call deflection feature" am: ba0f9d2973
Pooja Jain [Thu, 8 Feb 2018 01:27:45 +0000 (01:27 +0000)]
Merge "IMS: Add support in frameworks for call deflection feature" am: ba0f9d2973
am: f39bef4801

Change-Id: I843ae3caed5b066398e76825ea4e2753904b1f54

6 years agoMerge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into oc-dev am...
Etan Cohen [Thu, 8 Feb 2018 01:11:51 +0000 (01:11 +0000)]
Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into oc-dev am: d05a3078fc am: 0d2044af4b
am: f1ff948671

Change-Id: Ia9ca0839e05779d02560b07e1ab7103d9779c06e

6 years agoMerge "IMS: Add support in frameworks for call deflection feature"
Pooja Jain [Thu, 8 Feb 2018 01:00:43 +0000 (01:00 +0000)]
Merge "IMS: Add support in frameworks for call deflection feature"
am: ba0f9d2973

Change-Id: I6e209e21e46ce8127019d08cf59bda5d5bdd919e

6 years ago[automerger] Merge "[RTT] ParcelableRttResults parcel code fix" into mnc-dev am:...
Etan Cohen [Thu, 8 Feb 2018 00:42:11 +0000 (00:42 +0000)]
[automerger] Merge "[RTT] ParcelableRttResults parcel code fix" into mnc-dev am: e137462b2c am: 15754b34be am: c3fc912374 am: 0c37ab30a1 am: def8c23fb5 am: 2367a1a63e am: ec3b2c4683 am: bde11f2314 am: 71bb27a3da am: ff94c32675
am: 1c490515bd

Change-Id: I3581a6741418cfa0b59b48098511d9a295f3023a

6 years agoMerge "Handle onBindingDied in notification manager" into oc-mr1-dev
TreeHugger Robot [Thu, 8 Feb 2018 00:18:26 +0000 (00:18 +0000)]
Merge "Handle onBindingDied in notification manager" into oc-mr1-dev

6 years agoMerge "Merge changes from topic "am-02bffa5d2f4a4860b898fa67a751a8f5" into nyc-mr2...
Android Build Merger (Role) [Thu, 8 Feb 2018 00:15:26 +0000 (00:15 +0000)]
Merge "Merge changes from topic "am-02bffa5d2f4a4860b898fa67a751a8f5" into nyc-mr2-dev am: 39e6bc7495" into oc-dev

6 years agoMerge changes from topic "am-02bffa5d2f4a4860b898fa67a751a8f5" into nyc-mr2-dev
Etan Cohen [Thu, 8 Feb 2018 00:14:51 +0000 (00:14 +0000)]
Merge changes from topic "am-02bffa5d2f4a4860b898fa67a751a8f5" into nyc-mr2-dev
am: 39e6bc7495

Change-Id: I9bce38d411fa55aed455a3de2dba9d16cca4db6d

6 years ago[automerger] Merge "[RTT] ParcelableRttResults parcel code fix" into mnc-dev am:...
Etan Cohen [Thu, 8 Feb 2018 00:13:33 +0000 (00:13 +0000)]
[automerger] Merge "[RTT] ParcelableRttResults parcel code fix" into mnc-dev am: e137462b2c am: 15754b34be am: c3fc912374 am: 0c37ab30a1 am: def8c23fb5 am: 2367a1a63e am: ec3b2c4683 am: bde11f2314 am: 71bb27a3da
am: ff94c32675

Change-Id: Ieeb0c8b9f7ed9694d4f1bbd8399a80d146eb8eb8

6 years ago[automerger] Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into...
Android Build Merger (Role) [Thu, 8 Feb 2018 00:07:43 +0000 (00:07 +0000)]
[automerger] Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-mr1-dev am: bd629f69ed am: 1d10387f0d am: 7f4440640b

Change-Id: Ia78647742f44c9dc51d030d984b0dc9332139044

6 years ago[automerger] Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into...
Android Build Merger (Role) [Thu, 8 Feb 2018 00:07:36 +0000 (00:07 +0000)]
[automerger] Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-mr1-dev am: bd629f69ed am: 1d10387f0d

Change-Id: Iafbde79d1e7d4342b305726fd7b6e58984d98972

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

Change-Id: I23b5db36cb5d4d72a23894e75e36ad483ad23338

6 years agoMerge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into oc-dev am...
Etan Cohen [Thu, 8 Feb 2018 00:03:07 +0000 (00:03 +0000)]
Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into oc-dev am: d05a3078fc
am: 0d2044af4b

Change-Id: I7f622c50449e231d3bcf32dc3fee5ba2f14f8da1

6 years agoMerge changes from topic "am-075f69afbbda4610b4adfcdcb0fd78fc" into oc-dev
Android Build Merger (Role) [Wed, 7 Feb 2018 23:50:21 +0000 (23:50 +0000)]
Merge changes from topic "am-075f69afbbda4610b4adfcdcb0fd78fc" into oc-dev

* changes:
  [automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-dr1-dev am: c157934e61" into nyc-mr1-dev am: f4ea18a058 am: 3ba85c8957 am: 457e8440d7
  [automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-dr1-dev am: c157934e61" into nyc-mr1-dev am: f4ea18a058 am: 3ba85c8957
  Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-dr1-dev am: c157934e61" into nyc-mr1-dev am: f4ea18a058

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

* changes:
  [automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-dr1-dev am: c157934e61" into nyc-mr1-dev am: f4ea18a058 am: 3ba85c8957
  Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-dr1-dev am: c157934e61" into nyc-mr1-dev am: f4ea18a058

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

6 years agoMerge changes from topic "am-02bffa5d2f4a4860b898fa67a751a8f5" into nyc-mr2-dev
Android Build Merger (Role) [Wed, 7 Feb 2018 23:49:05 +0000 (23:49 +0000)]
Merge changes from topic "am-02bffa5d2f4a4860b898fa67a751a8f5" into nyc-mr2-dev

* changes:
  [automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dr1-dev am: 4feca3b99f am: b164f1dce0 am: 651db1820d
  [automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dr1-dev am: 4feca3b99f am: b164f1dce0
  Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dr1-dev am: 4feca3b99f

6 years agoMerge changes from topic "am-02bffa5d2f4a4860b898fa67a751a8f5" into cw-f-dev
Android Build Merger (Role) [Wed, 7 Feb 2018 23:49:05 +0000 (23:49 +0000)]
Merge changes from topic "am-02bffa5d2f4a4860b898fa67a751a8f5" into cw-f-dev

* changes:
  [automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dr1-dev am: 4feca3b99f am: b164f1dce0
  Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dr1-dev am: 4feca3b99f

6 years ago[automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12...
Android Build Merger (Role) [Wed, 7 Feb 2018 23:48:28 +0000 (23:48 +0000)]
[automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-dr1-dev am: c157934e61" into nyc-mr1-dev am: f4ea18a058 am: 3ba85c8957 am: 457e8440d7

Change-Id: I01f6d3b238bc1da87df6f6d46ae79cd1d679c72a

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

Change-Id: I0ec788c5d0429b15f4e5819e157f4374f413c517

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

Change-Id: I98fb6d1b1d7020d7ed057454754d1f1f6000fec6

6 years ago[automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into...
Android Build Merger (Role) [Wed, 7 Feb 2018 23:47:13 +0000 (23:47 +0000)]
[automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dr1-dev am: 4feca3b99f am: b164f1dce0 am: 651db1820d am: 024efb4645

Change-Id: I1fa6812361ebad2e2772577afd1924d52716e1cc

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

* changes:
  [automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dev am: 47f4b8411f am: e1ea5d3df1 am: 6f10ae56a2 am: 5e30c39b3d am: f6d4304e95
  [automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dev am: 47f4b8411f am: e1ea5d3df1 am: 6f10ae56a2 am: 5e30c39b3d
  [automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dev am: 47f4b8411f am: e1ea5d3df1 am: 6f10ae56a2
  [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-ef8b8c56c2ad450fb6fab355f35597b0" into nyc-mr2-dev
Android Build Merger (Role) [Wed, 7 Feb 2018 23:46:50 +0000 (23:46 +0000)]
Merge changes from topic "am-ef8b8c56c2ad450fb6fab355f35597b0" into nyc-mr2-dev

* changes:
  [automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dev am: 47f4b8411f am: e1ea5d3df1 am: 6f10ae56a2 am: 5e30c39b3d
  [automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dev am: 47f4b8411f am: e1ea5d3df1 am: 6f10ae56a2
  [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-ef8b8c56c2ad450fb6fab355f35597b0" into cw-f-dev
Android Build Merger (Role) [Wed, 7 Feb 2018 23:46:50 +0000 (23:46 +0000)]
Merge changes from topic "am-ef8b8c56c2ad450fb6fab355f35597b0" into cw-f-dev

* changes:
  [automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dev am: 47f4b8411f am: e1ea5d3df1 am: 6f10ae56a2
  [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 ago[automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into...
Android Build Merger (Role) [Wed, 7 Feb 2018 23:46:47 +0000 (23:46 +0000)]
[automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dr1-dev am: 4feca3b99f am: b164f1dce0 am: 651db1820d

Change-Id: I0b1823b4bc6a9120469245accf83d8ac9ba80029

6 years ago[automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into...
Android Build Merger (Role) [Wed, 7 Feb 2018 23:46:33 +0000 (23:46 +0000)]
[automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dr1-dev am: 4feca3b99f am: b164f1dce0

Change-Id: Iee5a04cf07d706faad6ea0a987d48feb10c504f1

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 ago[automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into...
Android Build Merger (Role) [Wed, 7 Feb 2018 23:45:34 +0000 (23:45 +0000)]
[automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dev am: 47f4b8411f am: e1ea5d3df1 am: 6f10ae56a2 am: 5e30c39b3d am: f6d4304e95

Change-Id: Id6d44fa2c822c4e887929a3260512dd9038574e8

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

Change-Id: I0205a5b671a946a63ef0acc1d45cc3dfff6469c1

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

Change-Id: I719bed29c66b873461642fbd3815a993d59720f2

6 years agoMerge changes from topic "am-513301705eec406eb3be13d14037bb53" into oc-dev
Android Build Merger (Role) [Wed, 7 Feb 2018 23:45:18 +0000 (23:45 +0000)]
Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into oc-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 am: 1746fb72aa am: 247b4d5372 am: 91d4d3db33
  [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 am: 1746fb72aa am: 247b4d5372
  [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 am: 1746fb72aa
  [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 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 agoMerge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-mr2-dev
Android Build Merger (Role) [Wed, 7 Feb 2018 23:45:18 +0000 (23:45 +0000)]
Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-mr2-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 am: 1746fb72aa am: 247b4d5372
  [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 am: 1746fb72aa
  [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 agoMerge changes from topic "am-513301705eec406eb3be13d14037bb53" into cw-f-dev
Android Build Merger (Role) [Wed, 7 Feb 2018 23:45:18 +0000 (23:45 +0000)]
Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into cw-f-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 am: 1746fb72aa
  [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 agoMerge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into oc-dev
Etan Cohen [Wed, 7 Feb 2018 23:43:32 +0000 (23:43 +0000)]
Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into oc-dev
am: d05a3078fc

Change-Id: I446c693cfd86954f789db4fbc6d11d6954c6d343

6 years ago[automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12...
Android Build Merger (Role) [Wed, 7 Feb 2018 23:42:17 +0000 (23:42 +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 am: 1746fb72aa am: 247b4d5372 am: 91d4d3db33

Change-Id: Idc336aa0746cd886f0e93de86d40313b423587c2

6 years ago[automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12...
Android Build Merger (Role) [Wed, 7 Feb 2018 23:42:05 +0000 (23:42 +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 am: 1746fb72aa am: 247b4d5372

Change-Id: Ic244a64ac6083757425460c2140db1ff3f1927fa

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

Change-Id: I846745fe866b2411c4ebd846086cc3bdcb408b7b

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:52 +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 am: 1746fb72aa

Change-Id: I6f4b93c8eefa4d406eca1467f6e6883028aa6c99

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

Change-Id: I02699a89d6be88700268e82b31aa459b72c78607

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

Change-Id: Ia902911c856ee0c6c5b6fa51527071f3b469775f

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:33:01 +0000 (23:33 +0000)]
Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-mr2-dev am: e12dda4b7c" into oc-dev

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

* changes:
  [automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-dr1-dev am: c157934e61 am: db125f50a0 am: afcd0fe457 am: 97eb85c032
  [automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-dr1-dev am: c157934e61 am: db125f50a0 am: afcd0fe457
  [automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-dr1-dev am: c157934e61 am: db125f50a0
  Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-dr1-dev am: c157934e61

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

* changes:
  [automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-dr1-dev am: c157934e61 am: db125f50a0
  Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-dr1-dev am: c157934e61