Pawin Vongmasa
|
c194d53411
|
Merge "Add libstagefright_soft_flacdec to core_base.mk" into oc-dr1-dev
am: 8fc04cc40a
Change-Id: I841a7739d2ec7de3945b04dce1609d071287f8dc
|
2017-07-20 23:11:35 +00:00 |
|
TreeHugger Robot
|
8fc04cc40a
|
Merge "Add libstagefright_soft_flacdec to core_base.mk" into oc-dr1-dev
|
2017-07-20 23:06:38 +00:00 |
|
Adam Seaton
|
56c43fefd9
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev am: 65b4d916e6 am: 60d6fe7552 am: cfbb865e29 am: 2d28e0372a -s ours am: 15d200c399 am: 0d1b7e183d am: 25eee603c8 -s ours am: a562f661ca -s ours am: a65c03517e -s ours am: 1215b2f770 -s ours am: 5c7aef3747 -s ours am: ff70113263
am: 302f80a992
Change-Id: I6054b5e9bd43ab6f65b829201c2e755cb106ac8a
|
2017-07-20 21:42:47 +00:00 |
|
Adam Seaton
|
302f80a992
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev am: 65b4d916e6 am: 60d6fe7552 am: cfbb865e29 am: 2d28e0372a -s ours am: 15d200c399 am: 0d1b7e183d am: 25eee603c8 -s ours am: a562f661ca -s ours am: a65c03517e -s ours am: 1215b2f770 -s ours am: 5c7aef3747 -s ours
am: ff70113263
Change-Id: I11021275894122faa1db94e927fd6f801eb8acda
|
2017-07-20 21:40:17 +00:00 |
|
Adam Seaton
|
2e5d8a9b01
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev am: 65b4d916e6 am: 60d6fe7552 am: cfbb865e29 am: 2d28e0372a -s ours am: 15d200c399 am: 0d1b7e183d am: 25eee603c8 am: 19ebbf50a4 am: 9f13a87b82 -s ours am: 54b51dc69a
am: 09b926c699
Change-Id: Ic7b05cd05e835b26ee3a0807b42a6bfeb8d17a94
|
2017-07-20 21:38:18 +00:00 |
|
Adam Seaton
|
ff70113263
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev am: 65b4d916e6 am: 60d6fe7552 am: cfbb865e29 am: 2d28e0372a -s ours am: 15d200c399 am: 0d1b7e183d am: 25eee603c8 -s ours am: a562f661ca -s ours am: a65c03517e -s ours am: 1215b2f770 -s ours
am: 5c7aef3747 -s ours
Change-Id: Iea1f7cca1c2973b7c761d08ef86d4b601576dd67
|
2017-07-20 21:38:16 +00:00 |
|
Adam Seaton
|
5c7aef3747
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev am: 65b4d916e6 am: 60d6fe7552 am: cfbb865e29 am: 2d28e0372a -s ours am: 15d200c399 am: 0d1b7e183d am: 25eee603c8 -s ours am: a562f661ca -s ours am: a65c03517e -s ours
am: 1215b2f770 -s ours
Change-Id: Id1e28c7a431fa76634aa7ea8010721c3578d75e5
|
2017-07-20 21:36:19 +00:00 |
|
Adam Seaton
|
09b926c699
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev am: 65b4d916e6 am: 60d6fe7552 am: cfbb865e29 am: 2d28e0372a -s ours am: 15d200c399 am: 0d1b7e183d am: 25eee603c8 am: 19ebbf50a4 am: 9f13a87b82 -s ours
am: 54b51dc69a
Change-Id: Ib0d67b51629889909ef645e4181dd4b4159f4ebd
|
2017-07-20 21:36:16 +00:00 |
|
Adam Seaton
|
54b51dc69a
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev am: 65b4d916e6 am: 60d6fe7552 am: cfbb865e29 am: 2d28e0372a -s ours am: 15d200c399 am: 0d1b7e183d am: 25eee603c8 am: 19ebbf50a4
am: 9f13a87b82 -s ours
Change-Id: I909711741b28cb8e2f2df8339276f3d79fec1e06
|
2017-07-20 21:34:15 +00:00 |
|
Adam Seaton
|
1215b2f770
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev am: 65b4d916e6 am: 60d6fe7552 am: cfbb865e29 am: 2d28e0372a -s ours am: 15d200c399 am: 0d1b7e183d am: 25eee603c8 -s ours am: a562f661ca -s ours
am: a65c03517e -s ours
Change-Id: I5ed187e174d8acfe59076da5af02b1135b1a9955
|
2017-07-20 21:34:15 +00:00 |
|
Adam Seaton
|
9f13a87b82
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev am: 65b4d916e6 am: 60d6fe7552 am: cfbb865e29 am: 2d28e0372a -s ours am: 15d200c399 am: 0d1b7e183d am: 25eee603c8
am: 19ebbf50a4
Change-Id: I87ae76f73665edf2ba7004aaacb5f7cf27b8b108
|
2017-07-20 21:32:17 +00:00 |
|
Adam Seaton
|
a65c03517e
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev am: 65b4d916e6 am: 60d6fe7552 am: cfbb865e29 am: 2d28e0372a -s ours am: 15d200c399 am: 0d1b7e183d am: 25eee603c8 -s ours
am: a562f661ca -s ours
Change-Id: I7d9efb4dcd6f0adfff83cf21df4d4e76cd422526
|
2017-07-20 21:32:15 +00:00 |
|
Adam Seaton
|
19ebbf50a4
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev am: 65b4d916e6 am: 60d6fe7552 am: cfbb865e29 am: 2d28e0372a -s ours am: 15d200c399 am: 0d1b7e183d
am: 25eee603c8
Change-Id: If92333e458ee2f7a31141e1fb72c867ec60c800f
|
2017-07-20 21:29:46 +00:00 |
|
Adam Seaton
|
a562f661ca
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev am: 65b4d916e6 am: 60d6fe7552 am: cfbb865e29 am: 2d28e0372a -s ours am: 15d200c399 am: 0d1b7e183d
am: 25eee603c8 -s ours
Change-Id: I1e180a225282a3bffe9c47334122f7580b2026a5
|
2017-07-20 21:29:45 +00:00 |
|
Adam Seaton
|
25eee603c8
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev am: 65b4d916e6 am: 60d6fe7552 am: cfbb865e29 am: 2d28e0372a -s ours am: 15d200c399
am: 0d1b7e183d
Change-Id: Ifc5eec2c2b43745f0d7bc61a670bc5c4b4cbdece
|
2017-07-20 21:27:45 +00:00 |
|
Adam Seaton
|
0d1b7e183d
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev am: 65b4d916e6 am: 60d6fe7552 am: cfbb865e29 am: 2d28e0372a -s ours
am: 15d200c399
Change-Id: I67a568b3e4c55df2fd57dc5af4ac32f3f037bbc9
|
2017-07-20 21:25:46 +00:00 |
|
Adam Seaton
|
15d200c399
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev am: 65b4d916e6 am: 60d6fe7552 am: cfbb865e29
am: 2d28e0372a -s ours
Change-Id: Ib8dfc0f08e2086b0161d9c7ad122103a95e1a709
|
2017-07-20 21:18:15 +00:00 |
|
Adam Seaton
|
a8772230d1
|
Merge changes I7c8a25a2,Ifb32d061 into oc-dev am: 683c44c812
am: c7d9294cd9
Change-Id: Iea69629779d87a7a6ae74216076f1093f13931b0
|
2017-07-20 21:10:44 +00:00 |
|
Adam Seaton
|
2d28e0372a
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev am: 65b4d916e6 am: 60d6fe7552
am: cfbb865e29
Change-Id: Idb5c1e9cc98cf9e235eaf4de07a94c26eec3455a
|
2017-07-20 21:10:44 +00:00 |
|
Adam Seaton
|
cfbb865e29
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev am: 65b4d916e6
am: 60d6fe7552
Change-Id: I22072a5a682601a1561f78284d99d2d3953d5dff
|
2017-07-20 21:04:14 +00:00 |
|
Adam Seaton
|
c7d9294cd9
|
Merge changes I7c8a25a2,Ifb32d061 into oc-dev
am: 683c44c812
Change-Id: Ifd90edf581b976684da3a5b9fa2a6dc3ac7102da
|
2017-07-20 20:57:46 +00:00 |
|
Adam Seaton
|
60d6fe7552
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev
am: 65b4d916e6
Change-Id: Ib983d0c46cbe3de3a57da7ec1b128dbe8eeb5627
|
2017-07-20 20:57:44 +00:00 |
|
Adam Seaton
|
683c44c812
|
Merge changes I7c8a25a2,Ifb32d061 into oc-dev
* changes:
Updating Security String to 2017-09-05 Bug:63846344
Updating Security String to 2017-09-01 Bug:63846344
|
2017-07-20 20:45:01 +00:00 |
|
Adam Seaton
|
65b4d916e6
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev
|
2017-07-20 20:44:51 +00:00 |
|
Colin Cross
|
443529098c
|
Merge "Merge "Revert "Use java prebuilts"" am: 4d69df5191 am: f4e78ccf25 am: 96018b3d10" into oc-dr1-dev-plus-aosp
am: 00f21a2360
Change-Id: Ib1186289e955e0b6f35285a192b2e02d8996f4ee
|
2017-07-19 23:08:25 +00:00 |
|
Adam Seaton
|
d57ce81269
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into lmp-dev am: 788d85f5ae -s ours am: c0d2cfb8b8 am: 214aeaefef -s ours am: 451a9d73bf am: d3789031c9 am: 35f0f8df33 am: f01d7163e8 -s ours am: aec34cff65 am: 8f46ad2ded am: 29c817a61c -s ours am: 50efec7a2c -s ours am: df338dadee -s ours am: a94af85a7d -s ours am: 4149340d7c -s ours am: b81e890ef9 am: bf774777e7
am: bc9262f23a
Change-Id: I6fa939d7e71eb18b9bce9d9ef2c52f7338695536
|
2017-07-19 23:07:46 +00:00 |
|
Android Build Merger (Role)
|
00f21a2360
|
Merge "Merge "Revert "Use java prebuilts"" am: 4d69df5191 am: f4e78ccf25 am: 96018b3d10" into oc-dr1-dev-plus-aosp
|
2017-07-19 22:58:49 +00:00 |
|
Colin Cross
|
f2da657628
|
Merge "Revert "Use java prebuilts"" am: 4d69df5191 am: f4e78ccf25
am: 96018b3d10
Change-Id: Ib54b8c0fbb95179bff97abe028d133da3528380f
|
2017-07-19 22:58:23 +00:00 |
|
Adam Seaton
|
bc9262f23a
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into lmp-dev am: 788d85f5ae -s ours am: c0d2cfb8b8 am: 214aeaefef -s ours am: 451a9d73bf am: d3789031c9 am: 35f0f8df33 am: f01d7163e8 -s ours am: aec34cff65 am: 8f46ad2ded am: 29c817a61c -s ours am: 50efec7a2c -s ours am: df338dadee -s ours am: a94af85a7d -s ours am: 4149340d7c -s ours am: b81e890ef9
am: bf774777e7
Change-Id: I0f583e320e81234d39d00d1423e1817bfd1893e4
|
2017-07-19 22:58:22 +00:00 |
|
Colin Cross
|
96018b3d10
|
Merge "Revert "Use java prebuilts"" am: 4d69df5191
am: f4e78ccf25
Change-Id: I1b0bfaa059f68e09c115662ca9f850213305b8f0
|
2017-07-19 22:55:23 +00:00 |
|
Adam Seaton
|
6e6617d31e
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into lmp-dev am: 788d85f5ae -s ours am: c0d2cfb8b8 am: 214aeaefef -s ours am: 451a9d73bf am: d3789031c9 am: 35f0f8df33 am: f01d7163e8 -s ours am: aec34cff65 am: 8f46ad2ded am: 29c817a61c -s ours am: 50efec7a2c -s ours am: df338dadee -s ours am: a94af85a7d -s ours am: 4149340d7c -s ours am: b81e890ef9 am: feb090c1b8
am: 19141646d1
Change-Id: I5e426da58552d7a9079ddbe170dd69442dbc2789
|
2017-07-19 22:55:21 +00:00 |
|
Colin Cross
|
f4e78ccf25
|
Merge "Revert "Use java prebuilts""
am: 4d69df5191
Change-Id: I978bf3d25e0be2a2a6b40c5b396821cc2a8d9365
|
2017-07-19 22:52:21 +00:00 |
|
Adam Seaton
|
19141646d1
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into lmp-dev am: 788d85f5ae -s ours am: c0d2cfb8b8 am: 214aeaefef -s ours am: 451a9d73bf am: d3789031c9 am: 35f0f8df33 am: f01d7163e8 -s ours am: aec34cff65 am: 8f46ad2ded am: 29c817a61c -s ours am: 50efec7a2c -s ours am: df338dadee -s ours am: a94af85a7d -s ours am: 4149340d7c -s ours am: b81e890ef9
am: feb090c1b8
Change-Id: I836b797c63fdbb4bbc8033fb968b63663e91fc31
|
2017-07-19 22:52:20 +00:00 |
|
Adam Seaton
|
f6c882c76b
|
Merge "Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into lmp-dev am: 788d85f5ae -s ours am: c0d2cfb8b8 am: 214aeaefef -s ours am: 451a9d73bf am: d3789031c9 am: 35f0f8df33 am: f01d7163e8 -s ours am: aec34cff65 am: 8f46ad2ded am: 29c817a61c am: dbecffb85f am: c7040501a1 -s ours am: 6ac9ecd397 am: 05eed82d81" into oc-dr1-dev-plus-aosp
am: 12704f3e27
Change-Id: Icbf6231abc5cc1299aee317092e269e8c240a185
|
2017-07-19 22:51:03 +00:00 |
|
Adam Seaton
|
c089ba0a55
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into lmp-dev am: 788d85f5ae -s ours am: c0d2cfb8b8 am: 214aeaefef -s ours am: 451a9d73bf am: d3789031c9 am: 35f0f8df33 am: f01d7163e8 -s ours am: aec34cff65 am: 8f46ad2ded am: 29c817a61c am: dbecffb85f am: c7040501a1 -s ours am: 6ac9ecd397 am: 265901b17b
am: 3b49e3e16b
Change-Id: I4e7cda65baff68edb16d18480d4d531c884ef9c5
|
2017-07-19 22:50:00 +00:00 |
|
Adam Seaton
|
bf774777e7
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into lmp-dev am: 788d85f5ae -s ours am: c0d2cfb8b8 am: 214aeaefef -s ours am: 451a9d73bf am: d3789031c9 am: 35f0f8df33 am: f01d7163e8 -s ours am: aec34cff65 am: 8f46ad2ded am: 29c817a61c -s ours am: 50efec7a2c -s ours am: df338dadee -s ours am: a94af85a7d -s ours am: 4149340d7c -s ours
am: b81e890ef9
Change-Id: I7b822b8a3fe4c3fd1f0221ad54c331e69b621c97
|
2017-07-19 22:49:52 +00:00 |
|
Adam Seaton
|
feb090c1b8
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into lmp-dev am: 788d85f5ae -s ours am: c0d2cfb8b8 am: 214aeaefef -s ours am: 451a9d73bf am: d3789031c9 am: 35f0f8df33 am: f01d7163e8 -s ours am: aec34cff65 am: 8f46ad2ded am: 29c817a61c -s ours am: 50efec7a2c -s ours am: df338dadee -s ours am: a94af85a7d -s ours am: 4149340d7c -s ours
am: b81e890ef9
Change-Id: I76868c7ef97d25b99c713b4f95122d43e94f15ba
|
2017-07-19 22:49:52 +00:00 |
|
Android Build Merger (Role)
|
12704f3e27
|
Merge "Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into lmp-dev am: 788d85f5ae -s ours am: c0d2cfb8b8 am: 214aeaefef -s ours am: 451a9d73bf am: d3789031c9 am: 35f0f8df33 am: f01d7163e8 -s ours am: aec34cff65 am: 8f46ad2ded am: 29c817a61c am: dbecffb85f am: c7040501a1 -s ours am: 6ac9ecd397 am: 05eed82d81" into oc-dr1-dev-plus-aosp
|
2017-07-19 22:47:33 +00:00 |
|
Adam Seaton
|
3b49e3e16b
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into lmp-dev am: 788d85f5ae -s ours am: c0d2cfb8b8 am: 214aeaefef -s ours am: 451a9d73bf am: d3789031c9 am: 35f0f8df33 am: f01d7163e8 -s ours am: aec34cff65 am: 8f46ad2ded am: 29c817a61c am: dbecffb85f am: c7040501a1 -s ours am: 6ac9ecd397
am: 265901b17b
Change-Id: I37cd17f5984160b7bdd59ba8748706afc41816b6
|
2017-07-19 22:47:20 +00:00 |
|
Adam Seaton
|
e6b2cb887f
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into lmp-dev am: 788d85f5ae -s ours am: c0d2cfb8b8 am: 214aeaefef -s ours am: 451a9d73bf am: d3789031c9 am: 35f0f8df33 am: f01d7163e8 -s ours am: aec34cff65 am: 8f46ad2ded am: 29c817a61c am: dbecffb85f am: c7040501a1 -s ours am: 6ac9ecd397
am: 05eed82d81
Change-Id: Id894f66ec72805495a41cb8e9a0a1266c95826e3
|
2017-07-19 22:47:20 +00:00 |
|
Adam Seaton
|
b81e890ef9
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into lmp-dev am: 788d85f5ae -s ours am: c0d2cfb8b8 am: 214aeaefef -s ours am: 451a9d73bf am: d3789031c9 am: 35f0f8df33 am: f01d7163e8 -s ours am: aec34cff65 am: 8f46ad2ded am: 29c817a61c -s ours am: 50efec7a2c -s ours am: df338dadee -s ours am: a94af85a7d -s ours
am: 4149340d7c -s ours
Change-Id: Iae950b38f0d5ae4870019e4586f42ce81dc33714
|
2017-07-19 22:47:19 +00:00 |
|
Adam Seaton
|
265901b17b
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into lmp-dev am: 788d85f5ae -s ours am: c0d2cfb8b8 am: 214aeaefef -s ours am: 451a9d73bf am: d3789031c9 am: 35f0f8df33 am: f01d7163e8 -s ours am: aec34cff65 am: 8f46ad2ded am: 29c817a61c am: dbecffb85f am: c7040501a1 -s ours
am: 6ac9ecd397
Change-Id: I5ab3cfb12bb66ec0d67233714aab4bf6001fe0ba
|
2017-07-19 22:44:19 +00:00 |
|
Adam Seaton
|
05eed82d81
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into lmp-dev am: 788d85f5ae -s ours am: c0d2cfb8b8 am: 214aeaefef -s ours am: 451a9d73bf am: d3789031c9 am: 35f0f8df33 am: f01d7163e8 -s ours am: aec34cff65 am: 8f46ad2ded am: 29c817a61c am: dbecffb85f am: c7040501a1 -s ours
am: 6ac9ecd397
Change-Id: Ifa3d8036c7b8a8c3165043875e806774713b3039
|
2017-07-19 22:44:19 +00:00 |
|
Adam Seaton
|
4149340d7c
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into lmp-dev am: 788d85f5ae -s ours am: c0d2cfb8b8 am: 214aeaefef -s ours am: 451a9d73bf am: d3789031c9 am: 35f0f8df33 am: f01d7163e8 -s ours am: aec34cff65 am: 8f46ad2ded am: 29c817a61c -s ours am: 50efec7a2c -s ours am: df338dadee -s ours
am: a94af85a7d -s ours
Change-Id: I73ca7a9fd67ec1c870675ba4416d650bb0586c23
|
2017-07-19 22:44:17 +00:00 |
|
Colin Cross
|
4d69df5191
|
Merge "Revert "Use java prebuilts""
|
2017-07-19 22:44:12 +00:00 |
|
Colin Cross
|
02112900cc
|
Revert "Use java prebuilts"
This reverts commit 1931750940.
Change-Id: I7a99fd6c53d35a2a674f2d60b113a727f3c453ce
|
2017-07-19 22:42:46 +00:00 |
|
Adam Seaton
|
6ac9ecd397
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into lmp-dev am: 788d85f5ae -s ours am: c0d2cfb8b8 am: 214aeaefef -s ours am: 451a9d73bf am: d3789031c9 am: 35f0f8df33 am: f01d7163e8 -s ours am: aec34cff65 am: 8f46ad2ded am: 29c817a61c am: dbecffb85f
am: c7040501a1 -s ours
Change-Id: Id2d6b7359c54f2a990e4fb8bb4041f1637423092
|
2017-07-19 22:41:18 +00:00 |
|
Adam Seaton
|
a94af85a7d
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into lmp-dev am: 788d85f5ae -s ours am: c0d2cfb8b8 am: 214aeaefef -s ours am: 451a9d73bf am: d3789031c9 am: 35f0f8df33 am: f01d7163e8 -s ours am: aec34cff65 am: 8f46ad2ded am: 29c817a61c -s ours am: 50efec7a2c -s ours
am: df338dadee -s ours
Change-Id: I73cd2a110a0c0957f7c0c9ea47ff8a6c730d8900
|
2017-07-19 22:41:17 +00:00 |
|
Adam Seaton
|
c7040501a1
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into lmp-dev am: 788d85f5ae -s ours am: c0d2cfb8b8 am: 214aeaefef -s ours am: 451a9d73bf am: d3789031c9 am: 35f0f8df33 am: f01d7163e8 -s ours am: aec34cff65 am: 8f46ad2ded am: 29c817a61c
am: dbecffb85f
Change-Id: Iee83fa15644388db9720b17b83ee744130ab77c1
|
2017-07-19 22:38:20 +00:00 |
|
Adam Seaton
|
df338dadee
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into lmp-dev am: 788d85f5ae -s ours am: c0d2cfb8b8 am: 214aeaefef -s ours am: 451a9d73bf am: d3789031c9 am: 35f0f8df33 am: f01d7163e8 -s ours am: aec34cff65 am: 8f46ad2ded am: 29c817a61c -s ours
am: 50efec7a2c -s ours
Change-Id: I6d763102767cbaebf6ebb25d5be76e8bbec662b7
|
2017-07-19 22:38:17 +00:00 |