Commit graph

2528 commits

Author SHA1 Message Date
Android Build Merger (Role)
acc2ec2643 Merge changes from topic "am-4303668227b54beb9c1e82d37d8a8d4c" into oc-dev am: 3216dd21b4 am: 88bfb52c5b am: f606031659
am: c4a981168e

Change-Id: I2cdf1747547ae60c5744316d991170c95aa9b488
2018-02-01 00:53:41 +00:00
Android Build Merger (Role)
64ce584f1e Merge changes from topic "am-f061ea53bac043638c1945db8b28ea56" into oc-dev am: 3875794b69 am: 59a6479664 am: 7efb78b047
am: 8636999ff4

Change-Id: I940ee04effaf0de668e03305413a66a1d29eddf3
2018-02-01 00:53:30 +00:00
Android Build Merger (Role)
6b2a32c63b Merge changes from topic "am-152b0310159c4cd6bf8d7e87c98040d9" into oc-dev am: 44a6f7b0c6 am: 4668102bf6 am: 324add11a7
am: 7eafa44c68

Change-Id: Iac4dc486c8dc6702b1d3a7334cab90c8b475d967
2018-02-01 00:53:18 +00:00
Android Build Merger (Role)
4e33436b98 Merge changes from topic "am-a026fb066f5d4de6b6b8eed401a8d29a" into oc-dev am: 20636372be am: 3f2f4efdbd am: cd4cb24ecd
am: 8ebce04e1d

Change-Id: I57884010c3d18a4e7e2c91dc974ec4b10b0ea982
2018-02-01 00:53:08 +00:00
Android Build Merger (Role)
9a098b899e Merge changes from topic "am-378c0e35e9684629b3aaf25a9a265a52" into oc-dev am: b561ef8553 am: 9bf3c6e006 am: 6f47dd957f
am: 6437033f7a

Change-Id: I7dc72e901d4abcebc7b53e6c9aaa24cb774f2f59
2018-02-01 00:52:56 +00:00
Android Build Merger (Role)
9e0bebc433 Merge changes from topic "am-2b228b69918a42e59bfbe1e26bf4796c" into oc-dev am: db91ff254d am: e9ea16ec42 am: 72e5dfd2a6
am: 196be205a1

Change-Id: I17351eae84e35977789fb59083d2e50d93c94cc7
2018-02-01 00:52:45 +00:00
Android Build Merger (Role)
d2ac8b6f2a Merge changes from topic "am-e418eebc66a1495eb35721b4c8f9d5ac" into oc-dev am: ed520eba4f am: 7cef186f2c am: 784e6f3bde
am: b7fa9596fc

Change-Id: I5a755be59192475ed9b60dc29d18a581812b56ce
2018-02-01 00:52:33 +00:00
Android Build Merger (Role)
5e9404accf Merge changes from topic "am-a79c39cd13fd4c62b75e3035afb8585c" into oc-dev am: 0c1bc6b5f2 am: 87aa9543e6 am: 86b96c128e
am: e8bbede4c6

Change-Id: Ib76fdeb70343ec32db6b4d6356b388f76185fc54
2018-02-01 00:52:20 +00:00
Android Build Merger (Role)
80350b685f [automerger] Merge changes from topic "am-8231d92f-aea1-4f7d-b84c-789126fb6fa2" into cw-f-dev am: b2457ec90b am: f2a30ca871 am: 28bd563101 am: f1d21fb11a am: e8f4790ddf
am: 5983881aa5

Change-Id: I5ef2f239a9034b4721517b44d4014258e9c3a642
2018-02-01 00:52:09 +00:00
Android Build Merger (Role)
39618eb5b7 Merge changes from topic "am-8231d92f-aea1-4f7d-b84c-789126fb6fa2" into oc-dev am: 3fffe3c300 am: 5759ea0b59 am: 57cd27cc9b
am: bbb7fefdb4

Change-Id: I7d4da74c75eae0c1e111b8778bea2ddb0390ab31
2018-02-01 00:51:53 +00:00
Android Build Merger (Role)
c4a981168e Merge changes from topic "am-4303668227b54beb9c1e82d37d8a8d4c" into oc-dev am: 3216dd21b4 am: 88bfb52c5b
am: f606031659

Change-Id: I63418ea79e06614b6e456c8323b5da7c6099a5e5
2018-01-31 23:06:46 +00:00
Android Build Merger (Role)
8636999ff4 Merge changes from topic "am-f061ea53bac043638c1945db8b28ea56" into oc-dev am: 3875794b69 am: 59a6479664
am: 7efb78b047

Change-Id: I088030e23345c6dd78372a5295a0ef423275fa76
2018-01-31 23:06:35 +00:00
Android Build Merger (Role)
7eafa44c68 Merge changes from topic "am-152b0310159c4cd6bf8d7e87c98040d9" into oc-dev am: 44a6f7b0c6 am: 4668102bf6
am: 324add11a7

Change-Id: I93cc3bee7b254b51ef1376b6644c20f0da5acb6b
2018-01-31 23:06:24 +00:00
Android Build Merger (Role)
8ebce04e1d Merge changes from topic "am-a026fb066f5d4de6b6b8eed401a8d29a" into oc-dev am: 20636372be am: 3f2f4efdbd
am: cd4cb24ecd

Change-Id: I70a163256f03cfc5a5519929227b97083745cc93
2018-01-31 23:06:12 +00:00
Android Build Merger (Role)
6437033f7a Merge changes from topic "am-378c0e35e9684629b3aaf25a9a265a52" into oc-dev am: b561ef8553 am: 9bf3c6e006
am: 6f47dd957f

Change-Id: Ifd6d05cb5c3963f2cdadcefc1ba0672b5fe4a6dc
2018-01-31 23:06:01 +00:00
Android Build Merger (Role)
196be205a1 Merge changes from topic "am-2b228b69918a42e59bfbe1e26bf4796c" into oc-dev am: db91ff254d am: e9ea16ec42
am: 72e5dfd2a6

Change-Id: Ib7e7f16dd772d711358ece5e9d867df7596928ea
2018-01-31 23:05:48 +00:00
Android Build Merger (Role)
b7fa9596fc Merge changes from topic "am-e418eebc66a1495eb35721b4c8f9d5ac" into oc-dev am: ed520eba4f am: 7cef186f2c
am: 784e6f3bde

Change-Id: I2f48e9051c4be024edd07ceee5ad053dbd91d442
2018-01-31 23:05:38 +00:00
Android Build Merger (Role)
e8bbede4c6 Merge changes from topic "am-a79c39cd13fd4c62b75e3035afb8585c" into oc-dev am: 0c1bc6b5f2 am: 87aa9543e6
am: 86b96c128e

Change-Id: Ia3d6d0cd24ddb4b4fed3436676f3a8a907ac2591
2018-01-31 23:05:29 +00:00
Android Build Merger (Role)
5983881aa5 [automerger] Merge changes from topic "am-8231d92f-aea1-4f7d-b84c-789126fb6fa2" into cw-f-dev am: b2457ec90b am: f2a30ca871 am: 28bd563101 am: f1d21fb11a
am: e8f4790ddf

Change-Id: Ica04145ada4dda8f080c53c582a6aced670d5788
2018-01-31 23:05:19 +00:00
Android Build Merger (Role)
bbb7fefdb4 Merge changes from topic "am-8231d92f-aea1-4f7d-b84c-789126fb6fa2" into oc-dev am: 3fffe3c300 am: 5759ea0b59
am: 57cd27cc9b

Change-Id: I667255ff2157e2caa3e56ccb8fd7ee0cda34c65c
2018-01-31 23:05:10 +00:00
Android Build Merger (Role)
f606031659 Merge changes from topic "am-4303668227b54beb9c1e82d37d8a8d4c" into oc-dev am: 3216dd21b4
am: 88bfb52c5b

Change-Id: Iaa98f8149175d3b231cb2a30b952fbf0c3908cc7
2018-01-31 22:40:25 +00:00
Android Build Merger (Role)
7efb78b047 Merge changes from topic "am-f061ea53bac043638c1945db8b28ea56" into oc-dev am: 3875794b69
am: 59a6479664

Change-Id: I70d90ede8b3fd2b6bd997a0c21400af6615969a8
2018-01-31 22:40:14 +00:00
Android Build Merger (Role)
324add11a7 Merge changes from topic "am-152b0310159c4cd6bf8d7e87c98040d9" into oc-dev am: 44a6f7b0c6
am: 4668102bf6

Change-Id: I42e71d2b9f76800cbbb6b42ba9169bdf4f9bd8f6
2018-01-31 22:40:04 +00:00
Android Build Merger (Role)
cd4cb24ecd Merge changes from topic "am-a026fb066f5d4de6b6b8eed401a8d29a" into oc-dev am: 20636372be
am: 3f2f4efdbd

Change-Id: Ia232c42c329843054ad6e7c4ac699ff6126da43a
2018-01-31 22:39:54 +00:00
Android Build Merger (Role)
6f47dd957f Merge changes from topic "am-378c0e35e9684629b3aaf25a9a265a52" into oc-dev am: b561ef8553
am: 9bf3c6e006

Change-Id: I4c254f62d08a969ee20ade8791e45c9eb97d885c
2018-01-31 22:39:45 +00:00
Android Build Merger (Role)
72e5dfd2a6 Merge changes from topic "am-2b228b69918a42e59bfbe1e26bf4796c" into oc-dev am: db91ff254d
am: e9ea16ec42

Change-Id: I8b3a3764cf1db6810aac731c0534d8fae700d419
2018-01-31 22:39:36 +00:00
Android Build Merger (Role)
784e6f3bde Merge changes from topic "am-e418eebc66a1495eb35721b4c8f9d5ac" into oc-dev am: ed520eba4f
am: 7cef186f2c

Change-Id: I5eaff4482009fea9edd66d311ba5d3afbd1b5b3c
2018-01-31 22:39:27 +00:00
Android Build Merger (Role)
86b96c128e Merge changes from topic "am-a79c39cd13fd4c62b75e3035afb8585c" into oc-dev am: 0c1bc6b5f2
am: 87aa9543e6

Change-Id: I607fb4194845628a00e2832828cfed093682cef0
2018-01-31 22:39:18 +00:00
Android Build Merger (Role)
e8f4790ddf [automerger] Merge changes from topic "am-8231d92f-aea1-4f7d-b84c-789126fb6fa2" into cw-f-dev am: b2457ec90b am: f2a30ca871 am: 28bd563101
am: f1d21fb11a

Change-Id: If9d41c1c54401acb324283e77614ea5ff0d237be
2018-01-31 22:39:09 +00:00
Android Build Merger (Role)
57cd27cc9b Merge changes from topic "am-8231d92f-aea1-4f7d-b84c-789126fb6fa2" into oc-dev am: 3fffe3c300
am: 5759ea0b59

Change-Id: I30df7ac1808586db869dc0093f0586aa80eb348b
2018-01-31 22:38:58 +00:00
Android Build Merger (Role)
88bfb52c5b Merge changes from topic "am-4303668227b54beb9c1e82d37d8a8d4c" into oc-dev
am: 3216dd21b4

Change-Id: I5e6d373bc84908854540de568407517e87a06709
2018-01-31 21:53:42 +00:00
Android Build Merger (Role)
59a6479664 Merge changes from topic "am-f061ea53bac043638c1945db8b28ea56" into oc-dev
am: 3875794b69

Change-Id: I9d3634e1b0d18f3fb97cd041085711a78ccbe6bf
2018-01-31 21:53:19 +00:00
Android Build Merger (Role)
4668102bf6 Merge changes from topic "am-152b0310159c4cd6bf8d7e87c98040d9" into oc-dev
am: 44a6f7b0c6

Change-Id: I6c967c331ee6be552d811437885495f25f83cf62
2018-01-31 21:52:20 +00:00
Android Build Merger (Role)
3f2f4efdbd Merge changes from topic "am-a026fb066f5d4de6b6b8eed401a8d29a" into oc-dev
am: 20636372be

Change-Id: Id6f54ca77df83bb80aafae177c80a82f0dcc5f4d
2018-01-31 21:52:02 +00:00
Android Build Merger (Role)
9bf3c6e006 Merge changes from topic "am-378c0e35e9684629b3aaf25a9a265a52" into oc-dev
am: b561ef8553

Change-Id: I8a2485123594ab16d0e8580fa5a13607df7a57af
2018-01-31 21:51:52 +00:00
Android Build Merger (Role)
e9ea16ec42 Merge changes from topic "am-2b228b69918a42e59bfbe1e26bf4796c" into oc-dev
am: db91ff254d

Change-Id: Ib798b056121499085d8692ac5e0e4f1d6c3709ba
2018-01-31 21:51:42 +00:00
Android Build Merger (Role)
7cef186f2c Merge changes from topic "am-e418eebc66a1495eb35721b4c8f9d5ac" into oc-dev
am: ed520eba4f

Change-Id: Ied433bcaa422f4b88cd42c6799abf72271862312
2018-01-31 21:51:32 +00:00
Android Build Merger (Role)
87aa9543e6 Merge changes from topic "am-a79c39cd13fd4c62b75e3035afb8585c" into oc-dev
am: 0c1bc6b5f2

Change-Id: Ie49688672608fbb5866b8f3eeaf3a524e65de219
2018-01-31 21:51:22 +00:00
Android Build Merger (Role)
f1d21fb11a [automerger] Merge changes from topic "am-8231d92f-aea1-4f7d-b84c-789126fb6fa2" into cw-f-dev am: b2457ec90b am: f2a30ca871
am: 28bd563101

Change-Id: Ieff0cefa7487c9620844128c7dc2b7f23e0ebe70
2018-01-31 21:51:11 +00:00
Android Build Merger (Role)
5759ea0b59 Merge changes from topic "am-8231d92f-aea1-4f7d-b84c-789126fb6fa2" into oc-dev
am: 3fffe3c300

Change-Id: Idc9eacb9a5e8bad128b9d77f08d604082fa67e15
2018-01-31 21:51:00 +00:00
Android Build Merger (Role)
3216dd21b4 Merge changes from topic "am-4303668227b54beb9c1e82d37d8a8d4c" into oc-dev
* changes:
  [automerger] Merge changes from topic "am-2b228b69918a42e59bfbe1e26bf4796c" into nyc-mr1-dev am: 6e621dbc9e am: 8cb1627ab3 am: da38909e1a
  [automerger] Merge changes from topic "am-2b228b69918a42e59bfbe1e26bf4796c" into nyc-mr1-dev am: 6e621dbc9e am: 8cb1627ab3
  Merge changes from topic "am-2b228b69918a42e59bfbe1e26bf4796c" into nyc-mr1-dev am: 6e621dbc9e
2018-01-31 21:25:13 +00:00
Android Build Merger (Role)
3875794b69 Merge changes from topic "am-f061ea53bac043638c1945db8b28ea56" into oc-dev
* changes:
  [automerger] Merge changes from topic "am-8231d92f-aea1-4f7d-b84c-789126fb6fa2" into cw-e-dev am: 7ddccbc4ee am: 8a72f8f4c7 am: 7a85e3718a am: 3b0c75bc1e am: 10205235b2 am: c7461f06f4 am: fa3061d84e
  [automerger] Merge changes from topic "am-8231d92f-aea1-4f7d-b84c-789126fb6fa2" into cw-e-dev am: 7ddccbc4ee am: 8a72f8f4c7 am: 7a85e3718a am: 3b0c75bc1e am: 10205235b2 am: c7461f06f4
  [automerger] Merge changes from topic "am-8231d92f-aea1-4f7d-b84c-789126fb6fa2" into cw-e-dev am: 7ddccbc4ee am: 8a72f8f4c7 am: 7a85e3718a am: 3b0c75bc1e am: 10205235b2
  [automerger] Merge changes from topic "am-8231d92f-aea1-4f7d-b84c-789126fb6fa2" into cw-e-dev am: 7ddccbc4ee am: 8a72f8f4c7 am: 7a85e3718a am: 3b0c75bc1e
  [automerger] Merge changes from topic "am-8231d92f-aea1-4f7d-b84c-789126fb6fa2" into cw-e-dev am: 7ddccbc4ee am: 8a72f8f4c7 am: 7a85e3718a
  [automerger] Merge changes from topic "am-8231d92f-aea1-4f7d-b84c-789126fb6fa2" into cw-e-dev am: 7ddccbc4ee am: 8a72f8f4c7
  Merge changes from topic "am-8231d92f-aea1-4f7d-b84c-789126fb6fa2" into cw-e-dev am: 7ddccbc4ee
2018-01-31 21:25:03 +00:00
Android Build Merger (Role)
44a6f7b0c6 Merge changes from topic "am-152b0310159c4cd6bf8d7e87c98040d9" into oc-dev
* changes:
  [automerger] Merge "Decoder: Fixed reset values in parse sps." into mnc-dev am: 78f1152a7a am: a53573889c am: 49f05ac885 am: 50a7d473f0 am: f5e1ab69db am: 4b95010577 am: 34e5734b43 am: 91821123df am: 175e050225
  [automerger] Merge "Decoder: Fixed reset values in parse sps." into mnc-dev am: 78f1152a7a am: a53573889c am: 49f05ac885 am: 50a7d473f0 am: f5e1ab69db am: 4b95010577 am: 34e5734b43 am: 91821123df
  [automerger] Merge "Decoder: Fixed reset values in parse sps." into mnc-dev am: 78f1152a7a am: a53573889c am: 49f05ac885 am: 50a7d473f0 am: f5e1ab69db am: 4b95010577 am: 34e5734b43
  [automerger] Merge "Decoder: Fixed reset values in parse sps." into mnc-dev am: 78f1152a7a am: a53573889c am: 49f05ac885 am: 50a7d473f0 am: f5e1ab69db am: 4b95010577
  [automerger] Merge "Decoder: Fixed reset values in parse sps." into mnc-dev am: 78f1152a7a am: a53573889c am: 49f05ac885 am: 50a7d473f0 am: f5e1ab69db
  [automerger] Merge "Decoder: Fixed reset values in parse sps." into mnc-dev am: 78f1152a7a am: a53573889c am: 49f05ac885 am: 50a7d473f0
  [automerger] Merge "Decoder: Fixed reset values in parse sps." into mnc-dev am: 78f1152a7a am: a53573889c am: 49f05ac885
  [automerger] Merge "Decoder: Fixed reset values in parse sps." into mnc-dev am: 78f1152a7a am: a53573889c
  Merge "Decoder: Fixed reset values in parse sps." into mnc-dev am: 78f1152a7a
2018-01-31 21:24:57 +00:00
Android Build Merger (Role)
cfe5c66c27 [automerger] Merge changes from topic "am-2b228b69918a42e59bfbe1e26bf4796c" into nyc-mr1-dev am: 6e621dbc9e am: 8cb1627ab3 am: da38909e1a
Change-Id: Ifcaba381484b3c2239d5117ff67523381533a002
2018-01-31 21:24:30 +00:00
Android Build Merger (Role)
da38909e1a [automerger] Merge changes from topic "am-2b228b69918a42e59bfbe1e26bf4796c" into nyc-mr1-dev am: 6e621dbc9e am: 8cb1627ab3
Change-Id: I2d8bd2ac342a240a2b7dae168b6ca9ec2453ad61
2018-01-31 21:24:29 +00:00
Android Build Merger (Role)
8cb1627ab3 Merge changes from topic "am-2b228b69918a42e59bfbe1e26bf4796c" into nyc-mr1-dev
am: 6e621dbc9e

Change-Id: I4940fdf4d79b0cb11929d41cfa380d704c66f06f
2018-01-31 21:24:24 +00:00
Android Build Merger (Role)
20636372be Merge changes from topic "am-a026fb066f5d4de6b6b8eed401a8d29a" into oc-dev
* changes:
  [automerger] Merge changes from topic "am-8231d92f-aea1-4f7d-b84c-789126fb6fa2" into nyc-dr1-dev am: b5b90f0549 am: 4ce45190dc am: 06f6cdc3db am: 18fd392771
  [automerger] Merge changes from topic "am-8231d92f-aea1-4f7d-b84c-789126fb6fa2" into nyc-dr1-dev am: b5b90f0549 am: 4ce45190dc am: 06f6cdc3db
  [automerger] Merge changes from topic "am-8231d92f-aea1-4f7d-b84c-789126fb6fa2" into nyc-dr1-dev am: b5b90f0549 am: 4ce45190dc
  Merge changes from topic "am-8231d92f-aea1-4f7d-b84c-789126fb6fa2" into nyc-dr1-dev am: b5b90f0549
2018-01-31 21:23:52 +00:00
Android Build Merger (Role)
e6f9444286 Merge changes from topic "am-a026fb066f5d4de6b6b8eed401a8d29a" into nyc-mr2-dev
* changes:
  [automerger] Merge changes from topic "am-8231d92f-aea1-4f7d-b84c-789126fb6fa2" into nyc-dr1-dev am: b5b90f0549 am: 4ce45190dc am: 06f6cdc3db
  [automerger] Merge changes from topic "am-8231d92f-aea1-4f7d-b84c-789126fb6fa2" into nyc-dr1-dev am: b5b90f0549 am: 4ce45190dc
  Merge changes from topic "am-8231d92f-aea1-4f7d-b84c-789126fb6fa2" into nyc-dr1-dev am: b5b90f0549
2018-01-31 21:23:52 +00:00
Android Build Merger (Role)
2c4c9f4cbb Merge changes from topic "am-a026fb066f5d4de6b6b8eed401a8d29a" into cw-f-dev
* changes:
  [automerger] Merge changes from topic "am-8231d92f-aea1-4f7d-b84c-789126fb6fa2" into nyc-dr1-dev am: b5b90f0549 am: 4ce45190dc
  Merge changes from topic "am-8231d92f-aea1-4f7d-b84c-789126fb6fa2" into nyc-dr1-dev am: b5b90f0549
2018-01-31 21:23:52 +00:00
Android Build Merger (Role)
b561ef8553 Merge changes from topic "am-378c0e35e9684629b3aaf25a9a265a52" into oc-dev
* changes:
  [automerger] Merge changes from topic "am-8231d92f-aea1-4f7d-b84c-789126fb6fa2" into mnc-dr-dev am: ef5bc92259 am: 058205df71 am: 4d3f46cd29 am: af29d06b2a am: 7ea361fff3 am: 003419bcca am: 71efd87155 am: 890b46d92a
  [automerger] Merge changes from topic "am-8231d92f-aea1-4f7d-b84c-789126fb6fa2" into mnc-dr-dev am: ef5bc92259 am: 058205df71 am: 4d3f46cd29 am: af29d06b2a am: 7ea361fff3 am: 003419bcca am: 71efd87155
  [automerger] Merge changes from topic "am-8231d92f-aea1-4f7d-b84c-789126fb6fa2" into mnc-dr-dev am: ef5bc92259 am: 058205df71 am: 4d3f46cd29 am: af29d06b2a am: 7ea361fff3 am: 003419bcca
  [automerger] Merge changes from topic "am-8231d92f-aea1-4f7d-b84c-789126fb6fa2" into mnc-dr-dev am: ef5bc92259 am: 058205df71 am: 4d3f46cd29 am: af29d06b2a am: 7ea361fff3
  [automerger] Merge changes from topic "am-8231d92f-aea1-4f7d-b84c-789126fb6fa2" into mnc-dr-dev am: ef5bc92259 am: 058205df71 am: 4d3f46cd29 am: af29d06b2a
  [automerger] Merge changes from topic "am-8231d92f-aea1-4f7d-b84c-789126fb6fa2" into mnc-dr-dev am: ef5bc92259 am: 058205df71 am: 4d3f46cd29
  [automerger] Merge changes from topic "am-8231d92f-aea1-4f7d-b84c-789126fb6fa2" into mnc-dr-dev am: ef5bc92259 am: 058205df71
  Merge changes from topic "am-8231d92f-aea1-4f7d-b84c-789126fb6fa2" into mnc-dr-dev am: ef5bc92259
2018-01-31 21:23:37 +00:00