commit | 4149340d7cf40dbbe2df4d3fb6ed102b52081743 | [log] [tgz] |
---|---|---|
author | Adam Seaton <aseaton@google.com> | Wed Jul 19 22:44:17 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Jul 19 22:44:17 2017 +0000 |
tree | 401abf392b2073bf982e85c616cfb4f787254a45 | |
parent | bac9a62680c08148014b63684358799fc9a977df [diff] | |
parent | a94af85a7d798591619239b1c86eca2c1d2bb8f1 [diff] |
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