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

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

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: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: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

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

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

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

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

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

commit | commitdiff | tree

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

[automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-mr1-dev am: a6d45d9768 am: c2f948ccc1 am: 4c4cf86e9d

Change-Id: I35be37f32451b472b8b5eedc8334ac09abc0a13c

commit | commitdiff | tree

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

[automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-mr1-dev am: a6d45d9768 am: c2f948ccc1

Change-Id: I2a0edb831cb181bdf9322b83c671f941557328c2

commit | commitdiff | tree

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

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

Change-Id: Ib9fc2e1e447a16cd2226a7235fc40f1b4cdf3641

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 23:29:08 +0000 (23:29 +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

Change-Id: I3ac80738b27ecd44b56724595678ebc1bff44044

commit | commitdiff | tree

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

[automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-dev am: f780227541 am: f4e8657a0e am: 2d3b87ce06 am: 5558a64435

Change-Id: I18ed33baba1b8e4286b24ba27e9a7bd0dec2306a

commit | commitdiff | tree

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

[automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-dev am: f780227541 am: f4e8657a0e am: 2d3b87ce06

Change-Id: I56e81d42e5a0c48fca9029faa254cb7aa345cb50

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

Merge changes from topic "am-922cd235076540bdb5f01e7024397331" into oc-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 am: a121aae9d6 am: 718f0ccee3 am: c5654f4be2
  [automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into cw-e-dev am: 6cc0b76e85 am: c8d99435c1 am: 117c674e9e am: 120c7a74e9 am: a121aae9d6 am: 718f0ccee3
  [automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into cw-e-dev am: 6cc0b76e85 am: c8d99435c1 am: 117c674e9e am: 120c7a74e9 am: a121aae9d6
  [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

commit | commitdiff | tree

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

Merge changes from topic "am-922cd235076540bdb5f01e7024397331" into nyc-mr2-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 am: a121aae9d6 am: 718f0ccee3
  [automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into cw-e-dev am: 6cc0b76e85 am: c8d99435c1 am: 117c674e9e am: 120c7a74e9 am: a121aae9d6
  [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

commit | commitdiff | tree

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

Merge changes from topic "am-922cd235076540bdb5f01e7024397331" into cw-f-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 am: a121aae9d6
  [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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

Merge changes from topic "am-5525892b4ae143f49ddb25efbc5582ff" into oc-dev

* changes:
  [automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr1.5-dev am: 1c198dfc71 am: dae4e83eaf am: aef43d6eb2 am: 7bd5507383 am: 7f50792e76 am: 2b90da4234
  [automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr1.5-dev am: 1c198dfc71 am: dae4e83eaf am: aef43d6eb2 am: 7bd5507383 am: 7f50792e76
  [automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr1.5-dev am: 1c198dfc71 am: dae4e83eaf am: aef43d6eb2 am: 7bd5507383
  [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

commit | commitdiff | tree

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

Merge changes from topic "am-5525892b4ae143f49ddb25efbc5582ff" into nyc-mr2-dev

* changes:
  [automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr1.5-dev am: 1c198dfc71 am: dae4e83eaf am: aef43d6eb2 am: 7bd5507383 am: 7f50792e76
  [automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr1.5-dev am: 1c198dfc71 am: dae4e83eaf am: aef43d6eb2 am: 7bd5507383
  [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

commit | commitdiff | tree

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

Merge changes from topic "am-5525892b4ae143f49ddb25efbc5582ff" into cw-f-dev

* changes:
  [automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr1.5-dev am: 1c198dfc71 am: dae4e83eaf am: aef43d6eb2 am: 7bd5507383
  [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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into oc-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 am: 93c80434f2 am: a40ac0dc8e am: 4608bfbf25
  [automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad am: 523fed0deb am: 04e84bb0ec am: 0dcedd2073 am: fe998dfc30 am: 93c80434f2 am: a40ac0dc8e
  [automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad am: 523fed0deb am: 04e84bb0ec am: 0dcedd2073 am: fe998dfc30 am: 93c80434f2
  [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

commit | commitdiff | tree

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

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

commit | commitdiff | tree

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

Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into cw-f-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 am: 93c80434f2
  [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

commit | commitdiff | tree

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

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 23:26:23 +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 am: a121aae9d6 am: 718f0ccee3 am: c5654f4be2

Change-Id: Iefde1a459ad11068b567887d2793548434030942

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 23:26:22 +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 am: 7bd5507383 am: 7f50792e76 am: 2b90da4234

Change-Id: I76961c3136b11b18caeb4705cd8ef69f7cf82b6a

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 23:26:19 +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 am: a121aae9d6 am: 718f0ccee3

Change-Id: Id470b8ad345cca6aa20a41c5e1742bcd9dd8fc06

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 23:26:17 +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 am: 7bd5507383 am: 7f50792e76

Change-Id: I680e0d1138855fb67a4dd4c5ca5d33424e523dff

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 23:26:13 +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 am: a121aae9d6

Change-Id: Ic1166873e5f114e0ca45c336f687f2d42929ae61

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 23:26:12 +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 am: 7bd5507383

Change-Id: I331838e6ec58b5df596779bf72f3b9d613d79be9

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

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

Change-Id: I110821de6c7e2dff931a17a7f8b3c11e7c13a18a

commit | commitdiff | tree

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

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

Change-Id: I70e9b520f0c262000718e64f1d2b96410739f0bb

commit | commitdiff | tree

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

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

Change-Id: I22bed228480d22ac630abe6b52d6e5d42685f51d

commit | commitdiff | tree

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

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

Change-Id: Ie269466813811e45af06597dcd9f765039d4c7cf

commit | commitdiff | tree

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

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

Change-Id: I20247f18f27d668e38c6dbf6e79ce184d3641298

commit | commitdiff | tree

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

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

Change-Id: I3cb0275cf475b0551dec3b9e4fbc6301756fb15d

commit | commitdiff | tree

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

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

Change-Id: I4e69906486cfec4c4db7cbb119df1d55aec55675

commit | commitdiff | tree

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

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

Change-Id: I2a07841e7cd27f2ba7c30f9b2df5ddf1afcc6ef5

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 23:22:35 +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 am: ec3b2c4683 am: bde11f2314 am: 71bb27a3da

Change-Id: Ie42ef0c2866bd9b0da38a674dce45ef25db225e5

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 23:22:30 +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 am: ec3b2c4683 am: bde11f2314

Change-Id: Ib885bd161e80cbca44c7dba902f16e761a60e4eb

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 23:22:24 +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 am: ec3b2c4683

Change-Id: I6efeff8c88619977284067b46080f9df54d73fba

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Wed, 7 Feb 2018 23:17:18 +0000 (23:17 +0000)]

Merge "Make TelephonyManager#getNai() public"

commit | commitdiff | tree