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

OSDN Git Service

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

commit | commitdiff | tree

Eric Enslen [Fri, 9 Feb 2018 21:26:09 +0000 (21:26 +0000)]

fix isActiveNetworkMetered with VPNs
am: c81ef19954

Change-Id: I8d59bc23e9153c54e64af59816d11301b490c9eb

commit | commitdiff | tree

tiansiming [田思明] [Fri, 9 Feb 2018 06:39:54 +0000 (06:39 +0000)]

Merge "Modify javadoc for onWindowShown" am: 2d46e07e48
am: d5d1718c4a

Change-Id: I82c1c9a4601e579b34e6f8c40f80258b78a8a7d8

commit | commitdiff | tree

tiansiming [田思明] [Fri, 9 Feb 2018 06:28:30 +0000 (06:28 +0000)]

Merge "Modify javadoc for onWindowShown"
am: 2d46e07e48

Change-Id: I126b0bcfbc5d1d10cad7564e7f8c8a7e419b96c6

commit | commitdiff | tree

yunseon.park [Fri, 9 Feb 2018 04:07:27 +0000 (04:07 +0000)]

Merge "Set the WebViewLoader's targetSdk same with framework's." am: d7187c90d0
am: f7ba304045

Change-Id: I123b9bdce3fde5405f356fb0b4c80e770eae43b8

commit | commitdiff | tree

yunseon.park [Fri, 9 Feb 2018 03:55:29 +0000 (03:55 +0000)]

Merge "Set the WebViewLoader's targetSdk same with framework's."
am: d7187c90d0

Change-Id: I98f83e81e2d4081288d3c4ac07732c1f3716beb5

commit | commitdiff | tree

Treehugger Robot [Fri, 9 Feb 2018 03:50:05 +0000 (03:50 +0000)]

Merge "Modify javadoc for onWindowShown"

commit | commitdiff | tree

Yifan Hong [Fri, 9 Feb 2018 00:44:01 +0000 (00:44 +0000)]

Merge "VintfObject: add getTargetFcmVersion" am: 5a748e5ee2
am: b901a37a85

Change-Id: Ide89fa9bc6c3dfb0bbeff6a3a8afdee4c31504e2

commit | commitdiff | tree

Yifan Hong [Fri, 9 Feb 2018 00:33:38 +0000 (00:33 +0000)]

Merge "VintfObject: add getTargetFcmVersion"
am: 5a748e5ee2

Change-Id: I902bf93cb06bdbab8aba58e41db8eb71a066dbb6

commit | commitdiff | tree

Treehugger Robot [Thu, 8 Feb 2018 21:12:46 +0000 (21:12 +0000)]

Merge "Set the WebViewLoader's targetSdk same with framework's."

commit | commitdiff | tree

Treehugger Robot [Thu, 8 Feb 2018 20:12:02 +0000 (20:12 +0000)]

Merge "VintfObject: add getTargetFcmVersion"

commit | commitdiff | tree

Eric Enslen [Thu, 8 Feb 2018 02:03:53 +0000 (18:03 -0800)]

fix isActiveNetworkMetered with VPNs

Bug: 72871435
Test: flashed and verified, also ran runtest framework-net

Change-Id: I69319a7db269489053426bb2d41574180be2d43d

commit | commitdiff | tree

Etan Cohen [Thu, 8 Feb 2018 10:26:32 +0000 (10:26 +0000)]

[automerger] Merge "Merge changes from topic "am-ef8b8c56c2ad450fb6fab355f35597b0" into nyc-mr1-dev am: 50d4e94767" into cw-f-dev am: 9e5c21243c am: 5a590c68df am: ad8bae1b73 am: 84f311b805
am: 761ac5fdcb

Change-Id: Idb6ad30dece553759ba6f24591e7856d80341395

commit | commitdiff | tree

Etan Cohen [Thu, 8 Feb 2018 10:02:36 +0000 (10:02 +0000)]

[automerger] Merge changes from topic "am-ef8b8c56c2ad450fb6fab355f35597b0" into nyc-mr1-dev am: 50d4e94767 am: 1aab54a3a3 am: 3979121a99 am: d1e93e361c am: bd7573db8f
am: a9bab4e5f6

Change-Id: Id0e9fd3aae59894c63a3276fc6c9fffa0ca17a34

commit | commitdiff | tree

Etan Cohen [Thu, 8 Feb 2018 09:45:54 +0000 (09:45 +0000)]

[automerger] Merge "Merge changes from topic "am-ef8b8c56c2ad450fb6fab355f35597b0" into nyc-mr1-dev am: 50d4e94767" into cw-f-dev am: 9e5c21243c am: 5a590c68df am: ad8bae1b73
am: 84f311b805

Change-Id: Idb48480b8075f4e11cd47b06ddb9fb4816815433

commit | commitdiff | tree

Etan Cohen [Thu, 8 Feb 2018 09:40:37 +0000 (09:40 +0000)]

[automerger] Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-dev am: fa72a625cc am: cdc187ee10 am: 363b273e9a am: 0c8b40873e am: d2428ebae4 am: bc7bb6c274 am: 7c2ccdd777
am: b374c759dc

Change-Id: I1ce0b88c95c2b824f4fecb5163e4b3dc7757d96c

commit | commitdiff | tree

Etan Cohen [Thu, 8 Feb 2018 09:23:39 +0000 (09:23 +0000)]

[automerger] Merge changes from topic "am-ef8b8c56c2ad450fb6fab355f35597b0" into nyc-mr1-dev am: 50d4e94767 am: 1aab54a3a3 am: 3979121a99 am: d1e93e361c
am: bd7573db8f

Change-Id: I6aa8290672e9df9a99e7346e9df86c03e64cda58

commit | commitdiff | tree

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

commit | commitdiff | tree

Etan Cohen [Thu, 8 Feb 2018 09:06:07 +0000 (09:06 +0000)]

[automerger] Merge "Merge changes from topic "am-ef8b8c56c2ad450fb6fab355f35597b0" into nyc-mr1-dev am: 50d4e94767" into cw-f-dev am: 9e5c21243c am: 5a590c68df
am: ad8bae1b73

Change-Id: I8f4db5b6b97eca28404de8fc990c18f9a8f50575

commit | commitdiff | tree

Etan Cohen [Thu, 8 Feb 2018 09:01:28 +0000 (09:01 +0000)]

[automerger] Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-dev am: fa72a625cc am: cdc187ee10 am: 363b273e9a am: 0c8b40873e am: d2428ebae4 am: bc7bb6c274
am: 7c2ccdd777

Change-Id: I61d28182d86e1655d078ff9cb8c3ba001cc6c9ae

commit | commitdiff | tree

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

commit | commitdiff | tree

Etan Cohen [Thu, 8 Feb 2018 08:45:32 +0000 (08:45 +0000)]

[automerger] Merge changes from topic "am-ef8b8c56c2ad450fb6fab355f35597b0" into nyc-mr1-dev am: 50d4e94767 am: 1aab54a3a3 am: 3979121a99
am: d1e93e361c

Change-Id: Ice0a36135954e952b307b7ee909ec4add3c5d6ee

commit | commitdiff | tree

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

commit | commitdiff | tree

Etan Cohen [Thu, 8 Feb 2018 08:25:53 +0000 (08:25 +0000)]

[automerger] Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-dev am: fa72a625cc am: cdc187ee10 am: 363b273e9a am: 0c8b40873e am: d2428ebae4
am: bc7bb6c274

Change-Id: I1f8ded34983a29bde17ffd1927a11fb67becb38e

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

goneil [Thu, 8 Feb 2018 02:40:21 +0000 (02:40 +0000)]

Merge "Make TelephonyManager#getNai() public" am: 4c8fa81d17
am: b731583b7a

Change-Id: Ia251ab0241f2e365556dbd4db663ead53af22d92

commit | commitdiff | tree

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

commit | commitdiff | tree

goneil [Thu, 8 Feb 2018 02:21:01 +0000 (02:21 +0000)]

Merge "Make TelephonyManager#getNai() public"
am: 4c8fa81d17

Change-Id: Ie219d338df42cf4593545180691759426616ade4

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 8 Feb 2018 01:07:32 +0000 (01:07 +0000)]

[automerger] Merge "Merge changes from topic "am-ef8b8c56c2ad450fb6fab355f35597b0" into nyc-mr1-dev am: 50d4e94767" into cw-f-dev am: 9e5c21243c am: 5a590c68df

Change-Id: Iad2f6bbb0783083c5e5a3845843b6ac92b1560d8

commit | commitdiff | tree

Etan Cohen [Thu, 8 Feb 2018 01:06:47 +0000 (01:06 +0000)]

Merge "Merge changes from topic "am-ef8b8c56c2ad450fb6fab355f35597b0" into nyc-mr1-dev am: 50d4e94767" into cw-f-dev
am: 9e5c21243c

Change-Id: Iff594c5c0a8e258528d6c0a8399a2df057f90633

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 8 Feb 2018 00:27:17 +0000 (00:27 +0000)]

Merge "Merge changes from topic "am-ef8b8c56c2ad450fb6fab355f35597b0" into nyc-mr1-dev am: 50d4e94767" into cw-f-dev

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 8 Feb 2018 00:26:40 +0000 (00:26 +0000)]

[automerger] Merge changes from topic "am-ef8b8c56c2ad450fb6fab355f35597b0" into nyc-mr1-dev am: 50d4e94767 am: 1aab54a3a3 am: 3979121a99

Change-Id: Ie81fae7db0592bbe435f2809aa0d93b58e581e06

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 8 Feb 2018 00:26:34 +0000 (00:26 +0000)]

[automerger] Merge changes from topic "am-ef8b8c56c2ad450fb6fab355f35597b0" into nyc-mr1-dev am: 50d4e94767 am: 1aab54a3a3

Change-Id: I83429de2ddef2fe856fb40035204791aa66796f8

commit | commitdiff | tree

Etan Cohen [Thu, 8 Feb 2018 00:26:07 +0000 (00:26 +0000)]

Merge changes from topic "am-ef8b8c56c2ad450fb6fab355f35597b0" into nyc-mr1-dev
am: 50d4e94767

Change-Id: I05fe6580c2bf6a44f5fadda55fa5b2d944d9be9e

commit | commitdiff | tree

TreeHugger Robot [Thu, 8 Feb 2018 00:18:26 +0000 (00:18 +0000)]

Merge "Handle onBindingDied in notification manager" into oc-mr1-dev

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 8 Feb 2018 00:16:53 +0000 (00:16 +0000)]

[automerger] Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-dev am: fa72a625cc am: cdc187ee10 am: 363b273e9a am: 0c8b40873e am: d2428ebae4

Change-Id: I6463a678c01ec630fb348fa6661beb681078fe4c

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 8 Feb 2018 00:16:48 +0000 (00:16 +0000)]

[automerger] Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-dev am: fa72a625cc am: cdc187ee10 am: 363b273e9a am: 0c8b40873e

Change-Id: If54c2a5deeede4eb51b48c18365229928e3db763

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 8 Feb 2018 00:16:33 +0000 (00:16 +0000)]

[automerger] Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-dev am: fa72a625cc am: cdc187ee10 am: 363b273e9a

Change-Id: Idafe9ec60693bf6ffaa3aa7833869261a416d4c1

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

frameworks/base

RSS Atom

About OSDN

Find Software

Develop Software

Help