Commit graph

39407 commits

Author SHA1 Message Date
Paul Scovanner
c7c7763e18 Merge changes from topic "am-25a1f704-80e7-4c0b-a6ef-9bda09527573" into oc-dev am: e95d55db1c
am: b293d74a3c

Change-Id: I5312b7e1ff9d3558ab9c051dc34ab34ff9c4ea92
2019-04-09 14:22:23 -07:00
Paul Scovanner
ee14e56c76 [DO NOT MERGE] Update Security String to 2019-06-01 Bug:129374896 Merged-In:1f8f84de6133f82df8210fa9214475d7c5aaa2f0 am: 3e8a1393a7
am: 9231b34069

Change-Id: Iee0d3857d653ffed9888b742535008c781577adc
2019-04-09 14:21:09 -07:00
Paul Scovanner
b293d74a3c Merge changes from topic "am-25a1f704-80e7-4c0b-a6ef-9bda09527573" into oc-dev
am: e95d55db1c

Change-Id: Ie4e72858b9c41aedad54b82f4b65289132370c10
2019-04-09 13:22:43 -07:00
Paul Scovanner
9231b34069 [DO NOT MERGE] Update Security String to 2019-06-01 Bug:129374896 Merged-In:1f8f84de6133f82df8210fa9214475d7c5aaa2f0
am: 3e8a1393a7

Change-Id: I2a8ce7b192ccb2bbf23c342c88da45d9c3b3f070
2019-04-09 13:06:43 -07:00
Paul Scovanner
e95d55db1c Merge changes from topic "am-25a1f704-80e7-4c0b-a6ef-9bda09527573" into oc-dev
* changes:
  [automerger] [DO NOT MERGE] Update Security String to 2019-06-01 Bug:129374896 am: bcdb638d6a am: f3e105e648 am: 41611b89ea am: ef4f971f0a skipped: 04ba31ff57
  [automerger] [DO NOT MERGE] Update Security String to 2019-06-01 Bug:129374896 am: bcdb638d6a am: f3e105e648 am: 41611b89ea am: ef4f971f0a
  [automerger] [DO NOT MERGE] Update Security String to 2019-06-01 Bug:129374896 am: bcdb638d6a am: f3e105e648 am: 41611b89ea
  [automerger] [DO NOT MERGE] Update Security String to 2019-06-01 Bug:129374896 am: bcdb638d6a am: f3e105e648
  [automerger] [DO NOT MERGE] Update Security String to 2019-06-01 Bug:129374896 am: bcdb638d6a
  [DO NOT MERGE] Update Security String to 2019-06-01 Bug:129374896
2019-04-09 18:54:57 +00:00
Paul Scovanner
3e8a1393a7 [DO NOT MERGE] Update Security String to 2019-06-01
Bug:129374896
Merged-In:1f8f84de6133f82df8210fa9214475d7c5aaa2f0
2019-04-08 21:48:10 +00:00
Paul Scovanner
1f8f84de61 [DO NOT MERGE] Update Security String to 2019-06-01
Bug:129374896
2019-04-08 18:01:43 +00:00
Android Build Merger (Role)
c9025d9833 [automerger] [DO NOT MERGE] Update Security String to 2019-06-01 Bug:129374896 am: bcdb638d6a am: f3e105e648 am: 41611b89ea am: ef4f971f0a skipped: 04ba31ff57
Change-Id: I465e072206cdc9727df1d7cd1f71b4f8f5ef7d38
2019-04-05 21:22:23 +00:00
Android Build Merger (Role)
04ba31ff57 [automerger] [DO NOT MERGE] Update Security String to 2019-06-01 Bug:129374896 am: bcdb638d6a am: f3e105e648 am: 41611b89ea am: ef4f971f0a
Change-Id: I6e36aef2c3c3307fcf2a34d5b71dccae5fb217a1
2019-04-05 21:22:21 +00:00
Android Build Merger (Role)
ef4f971f0a [automerger] [DO NOT MERGE] Update Security String to 2019-06-01 Bug:129374896 am: bcdb638d6a am: f3e105e648 am: 41611b89ea
Change-Id: I85f6511f1258aa33b9df20c42d58ea624a95130e
2019-04-05 21:22:19 +00:00
Android Build Merger (Role)
41611b89ea [automerger] [DO NOT MERGE] Update Security String to 2019-06-01 Bug:129374896 am: bcdb638d6a am: f3e105e648
Change-Id: I107595082da3470de9968e54ed4439ec4ca1e7da
2019-04-05 21:22:17 +00:00
Android Build Merger (Role)
f3e105e648 [automerger] [DO NOT MERGE] Update Security String to 2019-06-01 Bug:129374896 am: bcdb638d6a
Change-Id: If24a508f5a46ac7b82458721ab5b715d7c863dc7
2019-04-05 21:22:15 +00:00
Paul Scovanner
bcdb638d6a [DO NOT MERGE] Update Security String to 2019-06-01
Bug:129374896
2019-04-05 21:22:12 +00:00
Adam Seaton
796d90c141 [Do Not Merge] Update Platform Security String to 2019-05-05 for oc-mr1-dev
Bug:128322951
2019-03-11 20:50:55 +00:00
Elisa Pascual Trevino
801e91776e [DO NOT MERGE] Update Security String to 2019-05-01 in oc-mr1-dev
Bug: 128322951
2019-03-11 18:06:15 +00:00
Adam Seaton
7d7a3cbcc8 [DO NOT MERGE] Update platform security string to 2019-04-01 on oc-mr1-dev
Bug:124119313
2019-02-19 18:49:09 +00:00
Adam Seaton
eb164e06b2 [DO NOT MERGE] Update Platform Security String to 2019-03-05 for oc-mr1-dev Bug:122541777 2019-01-15 19:14:22 +00:00
TreeHugger Robot
7e8e840f61 Merge "[DO NOT MERGE] Update Platform Security String to 2019-03-01 for oc-mr1-dev Bug:122541777" into oc-mr1-dev 2019-01-15 01:52:09 +00:00
Adam Seaton
04bc1f36da [automerger] [DO NOT MERGE] Update Platform Security String to 2019-03-01 for nyc-dev Bug:122541777 am: 7a403979d6 am: e56e5efec9 am: 87877d530a am: 33ecfffc1f skipped: 440db90921 am: ed56062889
am: f583da6005

Change-Id: I9002810c0569b91ea6e17c84afaa798c84490fe1
2019-01-14 17:18:27 -08:00
Adam Seaton
f583da6005 [automerger] [DO NOT MERGE] Update Platform Security String to 2019-03-01 for nyc-dev Bug:122541777 am: 7a403979d6 am: e56e5efec9 am: 87877d530a am: 33ecfffc1f skipped: 440db90921
am: ed56062889

Change-Id: Ia7158b31b505312b079622e95394ca0cf9f56e99
2019-01-14 17:09:54 -08:00
Adam Seaton
6698efad06 [DO NOT MERGE] Update Platform Security String to 2019-03-01 for oc-mr1-dev Bug:122541777 2019-01-14 22:21:01 +00:00
Android Build Merger (Role)
ed56062889 [automerger] [DO NOT MERGE] Update Platform Security String to 2019-03-01 for nyc-dev Bug:122541777 am: 7a403979d6 am: e56e5efec9 am: 87877d530a am: 33ecfffc1f skipped: 440db90921
Change-Id: I01f14495a15278d3e4a9b753be3c323eb596f24e
2019-01-08 22:45:33 +00:00
Android Build Merger (Role)
440db90921 [automerger] [DO NOT MERGE] Update Platform Security String to 2019-03-01 for nyc-dev Bug:122541777 am: 7a403979d6 am: e56e5efec9 am: 87877d530a am: 33ecfffc1f
Change-Id: I4268b17fbd7e064dd5c1a77048ef238ce2eb3075
2019-01-08 22:45:32 +00:00
Android Build Merger (Role)
33ecfffc1f [automerger] [DO NOT MERGE] Update Platform Security String to 2019-03-01 for nyc-dev Bug:122541777 am: 7a403979d6 am: e56e5efec9 am: 87877d530a
Change-Id: Ic4324df9733bd6dec37aad0f2218c0a7a4fe6dc5
2019-01-08 22:45:30 +00:00
Android Build Merger (Role)
87877d530a [automerger] [DO NOT MERGE] Update Platform Security String to 2019-03-01 for nyc-dev Bug:122541777 am: 7a403979d6 am: e56e5efec9
Change-Id: Ic9d5eacd39787d9365523b1cea2c7c49b2eb88bc
2019-01-08 22:45:28 +00:00
Android Build Merger (Role)
e56e5efec9 [automerger] [DO NOT MERGE] Update Platform Security String to 2019-03-01 for nyc-dev Bug:122541777 am: 7a403979d6
Change-Id: I56938b60fddafa46970e6a45fffc48cbcd34434d
2019-01-08 22:45:27 +00:00
Adam Seaton
7a403979d6 [DO NOT MERGE] Update Platform Security String to 2019-03-01 for nyc-dev Bug:122541777 2019-01-08 22:45:25 +00:00
Elisa Pascual Trevino
8a6d4f5439 [DO NOT MERGE] Security String update to 2019-02-05
Bug: 120144419
2018-12-03 23:45:54 +00:00
Elisa Pascual Trevino
60fa5f84ee [DO NOT MERGE] Security String update to 2019-02-01
Bug: 120144419
2018-12-03 19:59:11 +00:00
Adam Seaton
7af38a13f3 [DO NOT MERGE] Update platform security string to 2018-12-05
bug: 117667960
2018-10-12 14:23:49 -07:00
Adam Seaton
b43ff9d8f5 [DO NOT MERGE] Update platform security String to 2018-12-01
bug:117667960
2018-10-12 14:11:24 -07:00
Adam Seaton
281cb3b172 [DO NOT MERGE] Update platform security string to 2018-11-05 on
oc-mr1-dev
bug:114110585
2018-09-10 16:42:41 -07:00
Adam Seaton
b703503c1d [DO NOT MERGE] Update platform security string to 2018-11-01 on oc-mr1-dev
Bug:114110585
2018-09-10 16:37:40 -07:00
JP Sugarbroad
aebb4e4c60 Merge changes from topic "am-b8fbc025-dd1b-4d0d-90bb-1a3f2f2e8d15" into oc-dev am: 3266dbabf9
am: 073a48b27d

Change-Id: I298dbc1500895ff6d3802008ad636f74482e2fd3
2018-09-10 15:06:18 -07:00
JP Sugarbroad
839e8e5621 [automerger] [RESTRICT AUTOMERGE] Add new Android.mk to handle repo move am: fd72eaab91 am: 69d914c57b am: 5c6df3c9a2 am: cd5dfa01ed skipped: 428866c804 am: 58265f83b2
am: 422182a1ac

Change-Id: Idefb550cc541e6e59c2d208b9c08fa110636def5
2018-09-10 15:05:14 -07:00
JP Sugarbroad
073a48b27d Merge changes from topic "am-b8fbc025-dd1b-4d0d-90bb-1a3f2f2e8d15" into oc-dev
am: 3266dbabf9

Change-Id: I7cb706927b8b155820c74d8c8635b4b0fac377d5
2018-09-10 15:00:53 -07:00
JP Sugarbroad
422182a1ac [automerger] [RESTRICT AUTOMERGE] Add new Android.mk to handle repo move am: fd72eaab91 am: 69d914c57b am: 5c6df3c9a2 am: cd5dfa01ed skipped: 428866c804
am: 58265f83b2

Change-Id: I7b25a2885d197236a0ad8ccd6fe53f272a5fb3b3
2018-09-10 14:59:16 -07:00
JP Sugarbroad
3266dbabf9 Merge changes from topic "am-b8fbc025-dd1b-4d0d-90bb-1a3f2f2e8d15" into oc-dev
* changes:
  [automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698 am: 41a932d505 am: 2df512843f am: f74efccc8d skipped: 0c824a631e
  [automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698 am: 41a932d505 am: 2df512843f am: f74efccc8d
  [automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698 am: 41a932d505 am: 2df512843f
  [automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698 am: 41a932d505
  [automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698
  [RESTRICT AUTOMERGE] Remove build/libs
2018-09-10 21:49:21 +00:00
JP Sugarbroad
5869cd6ac9 Merge changes from topic "am-b8fbc025-dd1b-4d0d-90bb-1a3f2f2e8d15" into cw-f-dev
* changes:
  [automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698 am: 41a932d505 am: 2df512843f
  [automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698 am: 41a932d505
  [automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698
  [RESTRICT AUTOMERGE] Remove build/libs
2018-09-10 21:49:21 +00:00
JP Sugarbroad
7728c817e3 Merge changes from topic "am-b8fbc025-dd1b-4d0d-90bb-1a3f2f2e8d15" into nyc-mr1-dev
* changes:
  [automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698 am: 41a932d505
  [automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698
  [RESTRICT AUTOMERGE] Remove build/libs
2018-09-10 21:49:21 +00:00
JP Sugarbroad
6b46dac5a9 Merge changes from topic "am-b8fbc025-dd1b-4d0d-90bb-1a3f2f2e8d15" into nyc-dr1-dev
* changes:
  [automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698
  [RESTRICT AUTOMERGE] Remove build/libs
2018-09-10 21:49:21 +00:00
JP Sugarbroad
4f6e887488 Merge "[RESTRICT AUTOMERGE] Remove build/libs" into nyc-dev 2018-09-10 21:49:21 +00:00
JP Sugarbroad
2ba5f007a9 Merge changes from topic "am-b8fbc025-dd1b-4d0d-90bb-1a3f2f2e8d15" into nyc-mr2-dev
* changes:
  [automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698 am: 41a932d505 am: 2df512843f am: f74efccc8d
  [automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698 am: 41a932d505 am: 2df512843f
  [automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698 am: 41a932d505
  [automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698
  [RESTRICT AUTOMERGE] Remove build/libs
2018-09-10 21:49:20 +00:00
Adam Seaton
090027fb46 DO NOT MERGE Update platform security string to 2018-10-05
bug:112535135
2018-08-13 18:41:41 +00:00
Android Build Merger (Role)
58265f83b2 [automerger] [RESTRICT AUTOMERGE] Add new Android.mk to handle repo move am: fd72eaab91 am: 69d914c57b am: 5c6df3c9a2 am: cd5dfa01ed skipped: 428866c804
Change-Id: I3d887e3be355404a171b84fe02111ec35ca29887
2018-07-20 00:08:12 +00:00
Android Build Merger (Role)
428866c804 [automerger] [RESTRICT AUTOMERGE] Add new Android.mk to handle repo move am: fd72eaab91 am: 69d914c57b am: 5c6df3c9a2 am: cd5dfa01ed
Change-Id: Iec882319f93d829c4721bbeec852f5eafdec538d
2018-07-20 00:08:11 +00:00
Android Build Merger (Role)
cd5dfa01ed [automerger] [RESTRICT AUTOMERGE] Add new Android.mk to handle repo move am: fd72eaab91 am: 69d914c57b am: 5c6df3c9a2
Change-Id: I2ef3465b53d7fdbac1ec53bd6aead997234c2d4e
2018-07-20 00:08:10 +00:00
Android Build Merger (Role)
5c6df3c9a2 [automerger] [RESTRICT AUTOMERGE] Add new Android.mk to handle repo move am: fd72eaab91 am: 69d914c57b
Change-Id: Ic00e7b9ba3443b444528092b1e0fba62182fb25c
2018-07-20 00:08:08 +00:00
Android Build Merger (Role)
69d914c57b [automerger] [RESTRICT AUTOMERGE] Add new Android.mk to handle repo move am: fd72eaab91
Change-Id: I3525350c7efdc6566fd9999e90610809c132d6b8
2018-07-20 00:08:06 +00:00
JP Sugarbroad
fd72eaab91 [RESTRICT AUTOMERGE] Add new Android.mk to handle repo move
We're moving the platform/build repository down a level, then symlinking
the directories and necessary files back into build/. So if we're still
in build/, keep searching for Android.mk files, otherwise stop, since
they'll be found through the symlinks.

Bug: 109817231
Change-Id: I057957e9b201c14dee185f9c00df157f178d8a31
2018-07-20 00:08:05 +00:00