| commit | f6c882c76b79ba8566b5979e09b99156c4ef2b80 | [log] [tgz] |
|---|---|---|
| author | Adam Seaton <aseaton@google.com> | Wed Jul 19 22:51:03 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jul 19 22:51:03 2017 +0000 |
| tree | 9882c6177d279addb63b5af0233bdaa097548d5b | |
| parent | c089ba0a5594636515e343d42deeab27b9c4ff11 [diff] | |
| parent | 12704f3e2796157c6d8a03692ae5bdbc2db2ea38 [diff] |
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