TreeHugger Robot
e39fa5ef8f
Merge changes Ica52e8f0,Id0ee07f9 into nyc-dev
...
* changes:
[DO NOT MERGE] Update platform security string to 2017-10-05 in nyc-dev Bug:64896113
[DO NOT MERGE] Update platform security string to 2017-10-01 in nyc-dev Bug:64896113
2017-08-22 18:19:20 +00:00
Android Build Merger (Role)
bfc62abf24
Merge "Merge "[Do Not Merge] Update platform security string to 2017-10-01 in KLP dev Bug:64896113 am: f2f5343ba1 am: dafd187ab5 am: 47c92b6200 -s ours am: bc464d7e8f -s ours am: 5c68c85011 am: f1f39061a7 -s ours am: c5287e96a4 am: 0412b3d0e3 am: 2df41e5dec am: 09ec3bc311 -s ours am: 9dbcf7c176 am: 3eac316736 am: 319003c0d8 am: 2b7d9b23c7 am: ce869d6025 -s ours am: 2633357494 am: 737bf518f8" into oc-dr1-dev-plus-aosp am: ccca4089e0" into oc-mr1-dev-plus-aosp
2017-08-22 18:00:01 +00:00
Adam Seaton
168829e421
Merge "[Do Not Merge] Update platform security string to 2017-10-01 in KLP dev Bug:64896113 am: f2f5343ba1 am: dafd187ab5 am: 47c92b6200 -s ours am: bc464d7e8f -s ours am: 5c68c85011 am: f1f39061a7 -s ours am: c5287e96a4 am: 0412b3d0e3 am: 2df41e5dec am: 09ec3bc311 -s ours am: 9dbcf7c176 am: 3eac316736 am: 319003c0d8 am: 2b7d9b23c7 am: ce869d6025 -s ours am: 2633357494 am: 737bf518f8" into oc-dr1-dev-plus-aosp
...
am: ccca4089e0
2017-08-22 17:59:42 +00:00
Android Build Merger (Role)
46e232b75f
Merge "[Do Not Merge] Update platform security string to 2017-10-01 in KLP dev Bug:64896113 am: f2f5343ba1 am: dafd187ab5 am: 47c92b6200 -s ours am: bc464d7e8f -s ours am: 5c68c85011 am: f1f39061a7 -s ours am: c5287e96a4 am: 0412b3d0e3 am: 2df41e5dec am: 09ec3bc311 -s ours am: 9dbcf7c176 am: 3eac316736 am: 319003c0d8 am: 2b7d9b23c7 am: ce869d6025 -s ours am: 2633357494 am: 0d76622c59 am: d7234e6329" into oc-mr1-dev-plus-aosp
2017-08-22 17:59:33 +00:00
Adam Seaton
807e9f3bcf
[Do Not Merge] Update platform security string to 2017-10-01 in KLP dev Bug:64896113 am: f2f5343ba1 am: dafd187ab5 am: 47c92b6200 -s ours am: bc464d7e8f -s ours am: 5c68c85011 am: f1f39061a7 -s ours am: c5287e96a4 am: 0412b3d0e3 am: 2df41e5dec am: 09ec3bc311 -s ours am: 9dbcf7c176 am: 3eac316736 am: 319003c0d8 am: 2b7d9b23c7 am: ce869d6025 -s ours am: 2633357494 am: 0d76622c59
...
am: 74e8826d26
2017-08-22 17:59:03 +00:00
Adam Seaton
50b2463685
[Do Not Merge] Update platform security string to 2017-10-01 in KLP dev Bug:64896113 am: f2f5343ba1 am: dafd187ab5 am: 47c92b6200 -s ours am: bc464d7e8f -s ours am: 5c68c85011 am: f1f39061a7 -s ours am: c5287e96a4 am: 0412b3d0e3 am: 2df41e5dec am: 09ec3bc311 -s ours am: 9dbcf7c176 am: 3eac316736 am: 319003c0d8 am: 2b7d9b23c7 am: ce869d6025 -s ours am: 2633357494 am: 0d76622c59
...
am: d7234e6329
2017-08-22 17:59:03 +00:00
Android Build Merger (Role)
ccca4089e0
Merge "[Do Not Merge] Update platform security string to 2017-10-01 in KLP dev Bug:64896113 am: f2f5343ba1 am: dafd187ab5 am: 47c92b6200 -s ours am: bc464d7e8f -s ours am: 5c68c85011 am: f1f39061a7 -s ours am: c5287e96a4 am: 0412b3d0e3 am: 2df41e5dec am: 09ec3bc311 -s ours am: 9dbcf7c176 am: 3eac316736 am: 319003c0d8 am: 2b7d9b23c7 am: ce869d6025 -s ours am: 2633357494 am: 737bf518f8" into oc-dr1-dev-plus-aosp
2017-08-22 17:56:54 +00:00
Adam Seaton
d7234e6329
[Do Not Merge] Update platform security string to 2017-10-01 in KLP dev Bug:64896113 am: f2f5343ba1 am: dafd187ab5 am: 47c92b6200 -s ours am: bc464d7e8f -s ours am: 5c68c85011 am: f1f39061a7 -s ours am: c5287e96a4 am: 0412b3d0e3 am: 2df41e5dec am: 09ec3bc311 -s ours am: 9dbcf7c176 am: 3eac316736 am: 319003c0d8 am: 2b7d9b23c7 am: ce869d6025 -s ours am: 2633357494
...
am: 0d76622c59
2017-08-22 17:56:31 +00:00
Adam Seaton
74e8826d26
[Do Not Merge] Update platform security string to 2017-10-01 in KLP dev Bug:64896113 am: f2f5343ba1 am: dafd187ab5 am: 47c92b6200 -s ours am: bc464d7e8f -s ours am: 5c68c85011 am: f1f39061a7 -s ours am: c5287e96a4 am: 0412b3d0e3 am: 2df41e5dec am: 09ec3bc311 -s ours am: 9dbcf7c176 am: 3eac316736 am: 319003c0d8 am: 2b7d9b23c7 am: ce869d6025 -s ours am: 2633357494
...
am: 0d76622c59
2017-08-22 17:56:31 +00:00
Adam Seaton
645cb875a2
[Do Not Merge] Update platform security string to 2017-10-01 in KLP dev Bug:64896113 am: f2f5343ba1 am: dafd187ab5 am: 47c92b6200 -s ours am: bc464d7e8f -s ours am: 5c68c85011 am: f1f39061a7 -s ours am: c5287e96a4 am: 0412b3d0e3 am: 2df41e5dec am: 09ec3bc311 -s ours am: 9dbcf7c176 am: 3eac316736 am: 319003c0d8 am: 2b7d9b23c7 am: ce869d6025 -s ours am: 2633357494
...
am: 737bf518f8
2017-08-22 17:56:30 +00:00
Adam Seaton
0d76622c59
[Do Not Merge] Update platform security string to 2017-10-01 in KLP dev Bug:64896113 am: f2f5343ba1 am: dafd187ab5 am: 47c92b6200 -s ours am: bc464d7e8f -s ours am: 5c68c85011 am: f1f39061a7 -s ours am: c5287e96a4 am: 0412b3d0e3 am: 2df41e5dec am: 09ec3bc311 -s ours am: 9dbcf7c176 am: 3eac316736 am: 319003c0d8 am: 2b7d9b23c7 am: ce869d6025 -s ours
...
am: 2633357494
2017-08-22 17:54:33 +00:00
Adam Seaton
737bf518f8
[Do Not Merge] Update platform security string to 2017-10-01 in KLP dev Bug:64896113 am: f2f5343ba1 am: dafd187ab5 am: 47c92b6200 -s ours am: bc464d7e8f -s ours am: 5c68c85011 am: f1f39061a7 -s ours am: c5287e96a4 am: 0412b3d0e3 am: 2df41e5dec am: 09ec3bc311 -s ours am: 9dbcf7c176 am: 3eac316736 am: 319003c0d8 am: 2b7d9b23c7 am: ce869d6025 -s ours
...
am: 2633357494
2017-08-22 17:54:33 +00:00
Adam Seaton
8d1518ea1a
[DO NOT MERGE] Update platform security string to 2017-10-01 in lmp-dev Bug:64896113 am: cf83f5a4f3 -s ours am: b40465ed59 am: acc7e47faa -s ours am: 286c80e90a am: 3b9a25dc46 am: 9f7048b3b5 am: 7c50949d13 -s ours am: 595b11f9b8 am: dc48c433d5 am: 3dd51fb95a am: 223d59710e am: 19709747d8 -s ours am: 0693cd362b am: 9f76abf94d
...
am: 4507de1d0c
2017-08-22 17:52:03 +00:00
Adam Seaton
2633357494
[Do Not Merge] Update platform security string to 2017-10-01 in KLP dev Bug:64896113 am: f2f5343ba1 am: dafd187ab5 am: 47c92b6200 -s ours am: bc464d7e8f -s ours am: 5c68c85011 am: f1f39061a7 -s ours am: c5287e96a4 am: 0412b3d0e3 am: 2df41e5dec am: 09ec3bc311 -s ours am: 9dbcf7c176 am: 3eac316736 am: 319003c0d8 am: 2b7d9b23c7
...
am: ce869d6025
2017-08-22 17:52:00 +00:00
Adam Seaton
140761af1e
[DO NOT MERGE] Update platform security string to 2017-10-01 in lmp-dev Bug:64896113 am: cf83f5a4f3 -s ours am: b40465ed59 am: acc7e47faa -s ours am: 286c80e90a am: 3b9a25dc46 am: 9f7048b3b5 am: 7c50949d13 -s ours am: 595b11f9b8 am: dc48c433d5 am: 3dd51fb95a am: 223d59710e am: 19709747d8 -s ours am: 0693cd362b am: 9f76abf94d
...
am: 5b8a2a0ccd
2017-08-22 17:49:32 +00:00
Adam Seaton
ce869d6025
[Do Not Merge] Update platform security string to 2017-10-01 in KLP dev Bug:64896113 am: f2f5343ba1 am: dafd187ab5 am: 47c92b6200 -s ours am: bc464d7e8f -s ours am: 5c68c85011 am: f1f39061a7 -s ours am: c5287e96a4 am: 0412b3d0e3 am: 2df41e5dec am: 09ec3bc311 -s ours am: 9dbcf7c176 am: 3eac316736 am: 319003c0d8
...
am: 2b7d9b23c7
2017-08-22 17:48:02 +00:00
Adam Seaton
4507de1d0c
[DO NOT MERGE] Update platform security string to 2017-10-01 in lmp-dev Bug:64896113 am: cf83f5a4f3 -s ours am: b40465ed59 am: acc7e47faa -s ours am: 286c80e90a am: 3b9a25dc46 am: 9f7048b3b5 am: 7c50949d13 -s ours am: 595b11f9b8 am: dc48c433d5 am: 3dd51fb95a am: 223d59710e am: 19709747d8 -s ours am: 0693cd362b
...
am: 9f76abf94d
2017-08-22 17:48:02 +00:00
Adam Seaton
5b8a2a0ccd
[DO NOT MERGE] Update platform security string to 2017-10-01 in lmp-dev Bug:64896113 am: cf83f5a4f3 -s ours am: b40465ed59 am: acc7e47faa -s ours am: 286c80e90a am: 3b9a25dc46 am: 9f7048b3b5 am: 7c50949d13 -s ours am: 595b11f9b8 am: dc48c433d5 am: 3dd51fb95a am: 223d59710e am: 19709747d8 -s ours am: 0693cd362b
...
am: 9f76abf94d
2017-08-22 17:48:02 +00:00
Adam Seaton
5fd977a9c0
[DO NOT MERGE] Update platform security string to 2017-10-01 in lmp-dev Bug:64896113 am: cf83f5a4f3 -s ours am: b40465ed59 am: acc7e47faa -s ours am: 286c80e90a am: 3b9a25dc46 am: 9f7048b3b5 am: 7c50949d13 -s ours am: 595b11f9b8 am: dc48c433d5 am: 3dd51fb95a am: 223d59710e am: 19709747d8 -s ours am: 0693cd362b am: e810d0003c
...
am: 388208be0f
2017-08-22 17:48:01 +00:00
Adam Seaton
388208be0f
[DO NOT MERGE] Update platform security string to 2017-10-01 in lmp-dev Bug:64896113 am: cf83f5a4f3 -s ours am: b40465ed59 am: acc7e47faa -s ours am: 286c80e90a am: 3b9a25dc46 am: 9f7048b3b5 am: 7c50949d13 -s ours am: 595b11f9b8 am: dc48c433d5 am: 3dd51fb95a am: 223d59710e am: 19709747d8 -s ours am: 0693cd362b
...
am: e810d0003c
2017-08-22 17:45:01 +00:00
Adam Seaton
2b7d9b23c7
[Do Not Merge] Update platform security string to 2017-10-01 in KLP dev Bug:64896113 am: f2f5343ba1 am: dafd187ab5 am: 47c92b6200 -s ours am: bc464d7e8f -s ours am: 5c68c85011 am: f1f39061a7 -s ours am: c5287e96a4 am: 0412b3d0e3 am: 2df41e5dec am: 09ec3bc311 -s ours am: 9dbcf7c176 am: 3eac316736
...
am: 319003c0d8
2017-08-22 17:42:31 +00:00
Adam Seaton
9f76abf94d
[DO NOT MERGE] Update platform security string to 2017-10-01 in lmp-dev Bug:64896113 am: cf83f5a4f3 -s ours am: b40465ed59 am: acc7e47faa -s ours am: 286c80e90a am: 3b9a25dc46 am: 9f7048b3b5 am: 7c50949d13 -s ours am: 595b11f9b8 am: dc48c433d5 am: 3dd51fb95a am: 223d59710e am: 19709747d8 -s ours
...
am: 0693cd362b
2017-08-22 17:42:31 +00:00
Adam Seaton
e810d0003c
[DO NOT MERGE] Update platform security string to 2017-10-01 in lmp-dev Bug:64896113 am: cf83f5a4f3 -s ours am: b40465ed59 am: acc7e47faa -s ours am: 286c80e90a am: 3b9a25dc46 am: 9f7048b3b5 am: 7c50949d13 -s ours am: 595b11f9b8 am: dc48c433d5 am: 3dd51fb95a am: 223d59710e am: 19709747d8 -s ours
...
am: 0693cd362b
2017-08-22 17:42:31 +00:00
Adam Seaton
319003c0d8
[Do Not Merge] Update platform security string to 2017-10-01 in KLP dev Bug:64896113 am: f2f5343ba1 am: dafd187ab5 am: 47c92b6200 -s ours am: bc464d7e8f -s ours am: 5c68c85011 am: f1f39061a7 -s ours am: c5287e96a4 am: 0412b3d0e3 am: 2df41e5dec am: 09ec3bc311 -s ours am: 9dbcf7c176
...
am: 3eac316736
2017-08-22 17:39:59 +00:00
Adam Seaton
0693cd362b
[DO NOT MERGE] Update platform security string to 2017-10-01 in lmp-dev Bug:64896113 am: cf83f5a4f3 -s ours am: b40465ed59 am: acc7e47faa -s ours am: 286c80e90a am: 3b9a25dc46 am: 9f7048b3b5 am: 7c50949d13 -s ours am: 595b11f9b8 am: dc48c433d5 am: 3dd51fb95a am: 223d59710e
...
am: 19709747d8
2017-08-22 17:39:58 +00:00
Adam Seaton
3eac316736
[Do Not Merge] Update platform security string to 2017-10-01 in KLP dev Bug:64896113 am: f2f5343ba1 am: dafd187ab5 am: 47c92b6200 -s ours am: bc464d7e8f -s ours am: 5c68c85011 am: f1f39061a7 -s ours am: c5287e96a4 am: 0412b3d0e3 am: 2df41e5dec am: 09ec3bc311 -s ours
...
am: 9dbcf7c176
2017-08-22 17:35:30 +00:00
Adam Seaton
19709747d8
[DO NOT MERGE] Update platform security string to 2017-10-01 in lmp-dev Bug:64896113 am: cf83f5a4f3 -s ours am: b40465ed59 am: acc7e47faa -s ours am: 286c80e90a am: 3b9a25dc46 am: 9f7048b3b5 am: 7c50949d13 -s ours am: 595b11f9b8 am: dc48c433d5 am: 3dd51fb95a
...
am: 223d59710e
2017-08-22 17:35:30 +00:00
Adam Seaton
223d59710e
[DO NOT MERGE] Update platform security string to 2017-10-01 in lmp-dev Bug:64896113 am: cf83f5a4f3 -s ours am: b40465ed59 am: acc7e47faa -s ours am: 286c80e90a am: 3b9a25dc46 am: 9f7048b3b5 am: 7c50949d13 -s ours am: 595b11f9b8 am: dc48c433d5
...
am: 3dd51fb95a
2017-08-22 17:30:57 +00:00
Adam Seaton
9dbcf7c176
[Do Not Merge] Update platform security string to 2017-10-01 in KLP dev Bug:64896113 am: f2f5343ba1 am: dafd187ab5 am: 47c92b6200 -s ours am: bc464d7e8f -s ours am: 5c68c85011 am: f1f39061a7 -s ours am: c5287e96a4 am: 0412b3d0e3 am: 2df41e5dec
...
am: 09ec3bc311
2017-08-22 17:30:56 +00:00
Adam Seaton
3dd51fb95a
[DO NOT MERGE] Update platform security string to 2017-10-01 in lmp-dev Bug:64896113 am: cf83f5a4f3 -s ours am: b40465ed59 am: acc7e47faa -s ours am: 286c80e90a am: 3b9a25dc46 am: 9f7048b3b5 am: 7c50949d13 -s ours am: 595b11f9b8
...
am: dc48c433d5
2017-08-22 17:27:59 +00:00
Adam Seaton
09ec3bc311
[Do Not Merge] Update platform security string to 2017-10-01 in KLP dev Bug:64896113 am: f2f5343ba1 am: dafd187ab5 am: 47c92b6200 -s ours am: bc464d7e8f -s ours am: 5c68c85011 am: f1f39061a7 -s ours am: c5287e96a4 am: 0412b3d0e3
...
am: 2df41e5dec
2017-08-22 17:27:59 +00:00
Adam Seaton
dc48c433d5
[DO NOT MERGE] Update platform security string to 2017-10-01 in lmp-dev Bug:64896113 am: cf83f5a4f3 -s ours am: b40465ed59 am: acc7e47faa -s ours am: 286c80e90a am: 3b9a25dc46 am: 9f7048b3b5 am: 7c50949d13 -s ours
...
am: 595b11f9b8
2017-08-22 17:25:28 +00:00
Adam Seaton
2df41e5dec
[Do Not Merge] Update platform security string to 2017-10-01 in KLP dev Bug:64896113 am: f2f5343ba1 am: dafd187ab5 am: 47c92b6200 -s ours am: bc464d7e8f -s ours am: 5c68c85011 am: f1f39061a7 -s ours am: c5287e96a4
...
am: 0412b3d0e3
2017-08-22 17:25:28 +00:00
Adam Seaton
0412b3d0e3
[Do Not Merge] Update platform security string to 2017-10-01 in KLP dev Bug:64896113 am: f2f5343ba1 am: dafd187ab5 am: 47c92b6200 -s ours am: bc464d7e8f -s ours am: 5c68c85011 am: f1f39061a7 -s ours
...
am: c5287e96a4
2017-08-22 17:23:27 +00:00
Adam Seaton
595b11f9b8
[DO NOT MERGE] Update platform security string to 2017-10-01 in lmp-dev Bug:64896113 am: cf83f5a4f3 -s ours am: b40465ed59 am: acc7e47faa -s ours am: 286c80e90a am: 3b9a25dc46 am: 9f7048b3b5
...
am: 7c50949d13
2017-08-22 17:23:26 +00:00
Adam Seaton
7c50949d13
[DO NOT MERGE] Update platform security string to 2017-10-01 in lmp-dev Bug:64896113 am: cf83f5a4f3 -s ours am: b40465ed59 am: acc7e47faa -s ours am: 286c80e90a am: 3b9a25dc46
...
am: 9f7048b3b5
2017-08-22 17:21:00 +00:00
Adam Seaton
c5287e96a4
[Do Not Merge] Update platform security string to 2017-10-01 in KLP dev Bug:64896113 am: f2f5343ba1 am: dafd187ab5 am: 47c92b6200 -s ours am: bc464d7e8f -s ours am: 5c68c85011
...
am: f1f39061a7
2017-08-22 17:20:56 +00:00
Adam Seaton
9f7048b3b5
[DO NOT MERGE] Update platform security string to 2017-10-01 in lmp-dev Bug:64896113 am: cf83f5a4f3 -s ours am: b40465ed59 am: acc7e47faa -s ours am: 286c80e90a
...
am: 3b9a25dc46
2017-08-22 17:18:58 +00:00
Adam Seaton
f1f39061a7
[Do Not Merge] Update platform security string to 2017-10-01 in KLP dev Bug:64896113 am: f2f5343ba1 am: dafd187ab5 am: 47c92b6200 -s ours am: bc464d7e8f -s ours
...
am: 5c68c85011
2017-08-22 17:18:57 +00:00
Adam Seaton
3b9a25dc46
[DO NOT MERGE] Update platform security string to 2017-10-01 in lmp-dev Bug:64896113 am: cf83f5a4f3 -s ours am: b40465ed59 am: acc7e47faa -s ours
...
am: 286c80e90a
2017-08-22 17:16:58 +00:00
Adam Seaton
5c68c85011
[Do Not Merge] Update platform security string to 2017-10-01 in KLP dev Bug:64896113 am: f2f5343ba1 am: dafd187ab5 am: 47c92b6200 -s ours
...
am: bc464d7e8f
2017-08-22 17:16:58 +00:00
Adam Seaton
286c80e90a
[DO NOT MERGE] Update platform security string to 2017-10-01 in lmp-dev Bug:64896113 am: cf83f5a4f3 -s ours am: b40465ed59
...
am: acc7e47faa
2017-08-22 17:13:24 +00:00
Adam Seaton
bc464d7e8f
[Do Not Merge] Update platform security string to 2017-10-01 in KLP dev Bug:64896113 am: f2f5343ba1 am: dafd187ab5
...
am: 47c92b6200
2017-08-22 17:13:24 +00:00
Adam Seaton
acc7e47faa
[DO NOT MERGE] Update platform security string to 2017-10-01 in lmp-dev Bug:64896113 am: cf83f5a4f3 -s ours
...
am: b40465ed59
2017-08-22 17:10:26 +00:00
Adam Seaton
47c92b6200
[Do Not Merge] Update platform security string to 2017-10-01 in KLP dev Bug:64896113 am: f2f5343ba1
...
am: dafd187ab5
2017-08-22 17:10:25 +00:00
Adam Seaton
b40465ed59
[DO NOT MERGE] Update platform security string to 2017-10-01 in lmp-dev Bug:64896113
...
am: cf83f5a4f3
2017-08-22 17:07:54 +00:00
Adam Seaton
dafd187ab5
[Do Not Merge] Update platform security string to 2017-10-01 in KLP dev Bug:64896113
...
am: f2f5343ba1
2017-08-22 17:06:25 +00:00
Narayan Kamath
d18e609790
core: Fix typo in build rule.
...
This doesn't appear to cause any issues that i'm aware of. This typo
was discovered because I made the same typo in a grep statement.
Test: make
Change-Id: I433e065c9ace15ab134f31c07e524a7555a8c0c1
2017-08-22 16:32:02 +01:00
Tobias Thierer
e7c468f156
Merge "Revert "Build support for 32-bit armv8-a"" am: 1da1c6d056 am: 0d35b9fba3 am: ff4ba02d5b
...
am: bc9829fb3f
2017-08-22 10:54:38 +00:00
Tobias Thierer
bc9829fb3f
Merge "Revert "Build support for 32-bit armv8-a"" am: 1da1c6d056 am: 0d35b9fba3
...
am: ff4ba02d5b
2017-08-22 10:48:44 +00:00
