Commit graph

2644 commits

Author SHA1 Message Date
Ritu Baldwa
2bdde8d7d8 [automerger] Decoder: Modify setting short term reference field flag am: 47cc04b40c am: 1991ec77e7 am: c18d0ab03a am: 8f05a87c39 am: ce46d15877 am: 8781a2aa9b am: 9cb460fb64 am: bae32f4c46 am: b8dd278100 am: 2dfd8c6d91 am: e44fbd93cb
am: 777146501f

Change-Id: Id57ac1a1b9a1b13e7ec829f1ee4c37d2051f7210
2018-04-05 18:29:29 -07:00
Ritu Baldwa
777146501f [automerger] Decoder: Modify setting short term reference field flag am: 47cc04b40c am: 1991ec77e7 am: c18d0ab03a am: 8f05a87c39 am: ce46d15877 am: 8781a2aa9b am: 9cb460fb64 am: bae32f4c46 am: b8dd278100 am: 2dfd8c6d91
am: e44fbd93cb

Change-Id: Ie4be903f762a324339626d2ce95aca16592fa213
2018-04-05 18:22:54 -07:00
Ritu Baldwa
e44fbd93cb [automerger] Decoder: Modify setting short term reference field flag am: 47cc04b40c am: 1991ec77e7 am: c18d0ab03a am: 8f05a87c39 am: ce46d15877 am: 8781a2aa9b am: 9cb460fb64 am: bae32f4c46 am: b8dd278100
am: 2dfd8c6d91

Change-Id: Icc4b494ef1b45fdb38f478395532d47de6b5e572
2018-04-05 18:16:23 -07:00
Android Build Merger (Role)
2dfd8c6d91 [automerger] Decoder: Modify setting short term reference field flag am: 47cc04b40c am: 1991ec77e7 am: c18d0ab03a am: 8f05a87c39 am: ce46d15877 am: 8781a2aa9b am: 9cb460fb64 am: bae32f4c46 am: b8dd278100
Change-Id: I9d0d825dc092c033eea729ea51eb8915c2502a68
2018-03-28 17:26:02 +00:00
Android Build Merger (Role)
b8dd278100 [automerger] Decoder: Modify setting short term reference field flag am: 47cc04b40c am: 1991ec77e7 am: c18d0ab03a am: 8f05a87c39 am: ce46d15877 am: 8781a2aa9b am: 9cb460fb64 am: bae32f4c46
Change-Id: I08654a8c17e20ca0dd1ab433e85f98127418634f
2018-03-28 17:26:01 +00:00
Android Build Merger (Role)
bae32f4c46 [automerger] Decoder: Modify setting short term reference field flag am: 47cc04b40c am: 1991ec77e7 am: c18d0ab03a am: 8f05a87c39 am: ce46d15877 am: 8781a2aa9b am: 9cb460fb64
Change-Id: Ia59cc5ad109277c015f14f84f91df875ba0a35fd
2018-03-28 17:26:00 +00:00
Android Build Merger (Role)
9cb460fb64 [automerger] Decoder: Modify setting short term reference field flag am: 47cc04b40c am: 1991ec77e7 am: c18d0ab03a am: 8f05a87c39 am: ce46d15877 am: 8781a2aa9b
Change-Id: Iee68471f672970bf11e1066da18be4208d87c595
2018-03-28 17:25:59 +00:00
Android Build Merger (Role)
8781a2aa9b [automerger] Decoder: Modify setting short term reference field flag am: 47cc04b40c am: 1991ec77e7 am: c18d0ab03a am: 8f05a87c39 am: ce46d15877
Change-Id: I9946acaead19bd15f5953a791429e12c5a5cf9df
2018-03-28 17:25:57 +00:00
Android Build Merger (Role)
ce46d15877 [automerger] Decoder: Modify setting short term reference field flag am: 47cc04b40c am: 1991ec77e7 am: c18d0ab03a am: 8f05a87c39
Change-Id: Ia34e744364f002a22b8bca070805db9fed213e83
2018-03-28 17:25:56 +00:00
Android Build Merger (Role)
8f05a87c39 [automerger] Decoder: Modify setting short term reference field flag am: 47cc04b40c am: 1991ec77e7 am: c18d0ab03a
Change-Id: I5096da453e95ac6e337e1423a2152729bb460918
2018-03-28 17:25:55 +00:00
Android Build Merger (Role)
c18d0ab03a [automerger] Decoder: Modify setting short term reference field flag am: 47cc04b40c am: 1991ec77e7
Change-Id: I1ac927422529ed7949875760c5614dbcc8ab0426
2018-03-28 17:25:53 +00:00
Android Build Merger (Role)
1991ec77e7 [automerger] Decoder: Modify setting short term reference field flag am: 47cc04b40c
Change-Id: If09f9c6ab67bb396ed22c71175ee7de8f3c4a040
2018-03-28 17:25:51 +00:00
Ritu Baldwa
47cc04b40c Decoder: Modify setting short term reference field flag
Do not mark bottom field as short term in case of error.

Bug: 73553038
Bug: 73552574
Bug: 73552999
Test: poc before/after
Change-Id: I8576861af36996a361a81f48ba9b251f0ae4e660
2018-03-28 10:24:26 -07:00
Android Build Merger (Role)
99702d3aef [automerger] Merge "Merge "Merge changes from topic "am-8231d92f-aea1-4f7d-b84c-789126fb6fa2" into cw-e-dev am: 7ddccbc4ee" into mnc-dr1.5-dev am: 42a053fe83" into nyc-dev am: 361390bbc6 am: ee555d921e am: 5b1296201b am: a2a9a8d8ec am: c3c07aa307 am: e34b0c7b50 am: d1fafa9170 am: bff6aaa508
am: 4747f418bf

Change-Id: Iaae3c3fbf2a17c690ad1f1cee0da17bce11646ea
2018-02-01 00:55:28 +00:00
Android Build Merger (Role)
ca6706902e [automerger] Merge changes from topic "am-c9e7b840dd89496cad321d7c52b28826" into nyc-dr1-dev am: 72c25a331e am: 99d693c89f am: 29819a74ab am: 2c48ad1660 am: 989db21f60 am: 0456f282de am: 91a7eef76b
am: 77972d30d4

Change-Id: I26b5f83d19c3aac5afd6e9397c630f5c24c4530e
2018-02-01 00:55:17 +00:00
Android Build Merger (Role)
50e055e4ff Merge changes from topic "am-c9e7b840dd89496cad321d7c52b28826" into nyc-mr2-dev am: 6052f446a4 am: 82a4181619 am: 0165216b58 am: 43a7b0a4df
am: 496e24f7b8

Change-Id: I7cfc4ad8892760286fcb67a4164bf7d7b6079940
2018-02-01 00:55:08 +00:00
Android Build Merger (Role)
f9081500ac Merge changes from topic "am-c9e7b840dd89496cad321d7c52b28826" into oc-dev am: 31e502e108 am: 39d8d29243 am: 692842b551
am: 503115e186

Change-Id: I2f4bd2785b71d0ea033f4338b47e612ddccedc10
2018-02-01 00:54:56 +00:00
Android Build Merger (Role)
79a07fe1bc [automerger] Merge changes from topic "am-152b0310159c4cd6bf8d7e87c98040d9" into cw-e-dev am: 16e1cbc2d9 am: a0f9fb4a8d am: 8c2d760c29 am: eb42814612 am: e7eb563d5d am: 25be26f234 am: 3444f21010 am: eb492b0cec am: fa6f78c9be am: 696f20c064
am: 6050e6adb5

Change-Id: I04f7c9c9a9ce564e4a755180bd1dbb05b1b082dd
2018-02-01 00:54:43 +00:00
Android Build Merger (Role)
e17e1ab2a0 [automerger] Merge changes from topic "am-152b0310159c4cd6bf8d7e87c98040d9" into mnc-dr1.5-dev am: b473d8251e am: 96c1d6df9f am: 7a3d5521d8 am: 0d37dc5008 am: aca8ca2f5b am: ebd8d36a4c am: 31983fdfec am: 429936a511 am: c424a9c8ed
am: 3e0e68d0f2

Change-Id: Ifb95ef80d51e7bbb3c9149cb8778970238032f6b
2018-02-01 00:54:29 +00:00
Android Build Merger (Role)
224bb57602 [automerger] Merge "Merge changes from topic "am-8231d92f-aea1-4f7d-b84c-789126fb6fa2" into nyc-dr1-dev am: b5b90f0549" into nyc-mr1-dev am: 7adc0cb8e3 am: 5318b42c68 am: 97e7acf7a9 am: b191092dc9 am: ed4635ddc5 am: 73c8dd1f9f
am: e01949db29

Change-Id: I47449f5c7e57e32a286d3f66dd02ce0918a7fade
2018-02-01 00:54:17 +00:00
Android Build Merger (Role)
e0d3071ff4 [automerger] Merge changes from topic "am-378c0e35e9684629b3aaf25a9a265a52" into nyc-mr1-dev am: 7ce956e469 am: 9057a4a5cd am: b20907dade am: aabdf5d653 am: 6a3a732437 am: d0dee85b1e
am: 1696db4866

Change-Id: I36ffb264afcedfa79a19411ca7ef9217b11a7127
2018-02-01 00:54:04 +00:00
Android Build Merger (Role)
d8b03c615f Merge changes from topic "am-a7843e11fb1e4c56bdc3daa910f738bb" into oc-dev am: 64c5e54e64 am: 4eb42d0eb7 am: 5019004fb6
am: c7778773a6

Change-Id: I002b2c9b575c862cacfc8a9e83aedadfc4488944
2018-02-01 00:53:53 +00:00
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)
4747f418bf [automerger] Merge "Merge "Merge changes from topic "am-8231d92f-aea1-4f7d-b84c-789126fb6fa2" into cw-e-dev am: 7ddccbc4ee" into mnc-dr1.5-dev am: 42a053fe83" into nyc-dev am: 361390bbc6 am: ee555d921e am: 5b1296201b am: a2a9a8d8ec am: c3c07aa307 am: e34b0c7b50 am: d1fafa9170
am: bff6aaa508

Change-Id: I8ad69bd56b1d0968955f6d3a5682e9e59a11628b
2018-01-31 23:09:49 +00:00
Android Build Merger (Role)
77972d30d4 [automerger] Merge changes from topic "am-c9e7b840dd89496cad321d7c52b28826" into nyc-dr1-dev am: 72c25a331e am: 99d693c89f am: 29819a74ab am: 2c48ad1660 am: 989db21f60 am: 0456f282de
am: 91a7eef76b

Change-Id: I04b5cdadf0a982139334e751fa9b6277033f27de
2018-01-31 23:09:40 +00:00
Android Build Merger (Role)
496e24f7b8 Merge changes from topic "am-c9e7b840dd89496cad321d7c52b28826" into nyc-mr2-dev am: 6052f446a4 am: 82a4181619 am: 0165216b58
am: 43a7b0a4df

Change-Id: Ia5bedf7ebe6b414265621448b77082ee9ce4dea1
2018-01-31 23:09:31 +00:00
Android Build Merger (Role)
503115e186 Merge changes from topic "am-c9e7b840dd89496cad321d7c52b28826" into oc-dev am: 31e502e108 am: 39d8d29243
am: 692842b551

Change-Id: Ib803db4ca3443b04ae257c018f55a6b6bd03ca1b
2018-01-31 23:09:20 +00:00
Android Build Merger (Role)
6050e6adb5 [automerger] Merge changes from topic "am-152b0310159c4cd6bf8d7e87c98040d9" into cw-e-dev am: 16e1cbc2d9 am: a0f9fb4a8d am: 8c2d760c29 am: eb42814612 am: e7eb563d5d am: 25be26f234 am: 3444f21010 am: eb492b0cec am: fa6f78c9be
am: 696f20c064

Change-Id: I9ec499caa67d17e9e4fb0c3582eb16a8dc5543aa
2018-01-31 23:09:11 +00:00
Android Build Merger (Role)
3e0e68d0f2 [automerger] Merge changes from topic "am-152b0310159c4cd6bf8d7e87c98040d9" into mnc-dr1.5-dev am: b473d8251e am: 96c1d6df9f am: 7a3d5521d8 am: 0d37dc5008 am: aca8ca2f5b am: ebd8d36a4c am: 31983fdfec am: 429936a511
am: c424a9c8ed

Change-Id: Idee11078a4c7b7dd26178670f322c1c7ecd79ec4
2018-01-31 23:09:00 +00:00
Android Build Merger (Role)
e01949db29 [automerger] Merge "Merge changes from topic "am-8231d92f-aea1-4f7d-b84c-789126fb6fa2" into nyc-dr1-dev am: b5b90f0549" into nyc-mr1-dev am: 7adc0cb8e3 am: 5318b42c68 am: 97e7acf7a9 am: b191092dc9 am: ed4635ddc5
am: 73c8dd1f9f

Change-Id: Ie1660e1967fe95fdda4f947500fa3a977fa3336c
2018-01-31 23:07:15 +00:00
Android Build Merger (Role)
1696db4866 [automerger] Merge changes from topic "am-378c0e35e9684629b3aaf25a9a265a52" into nyc-mr1-dev am: 7ce956e469 am: 9057a4a5cd am: b20907dade am: aabdf5d653 am: 6a3a732437
am: d0dee85b1e

Change-Id: I2359c0bb903c7d14aceed6d15188efddb8c7aee7
2018-01-31 23:07:06 +00:00
Android Build Merger (Role)
c7778773a6 Merge changes from topic "am-a7843e11fb1e4c56bdc3daa910f738bb" into oc-dev am: 64c5e54e64 am: 4eb42d0eb7
am: 5019004fb6

Change-Id: I45717cc23cf5eab8581cd0c37d3aa2bdb4a9945e
2018-01-31 23:06:57 +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