commit | 14900aad64b8411e110fb08810c3324dac1e7fdd | [log] [tgz] |
---|---|---|
author | Elisa Pascual Trevino <elisapascual@google.com> | Mon Nov 13 21:00:27 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Nov 13 21:00:27 2017 +0000 |
tree | 6235343a9ffa9923bc662036b87afbe7211d0671 | |
parent | f691262946ba2e7b709142a9f9fd9d8f9cbd5164 [diff] | |
parent | 38b24d03b5be9b162a99e9ffef503a13b3749297 [diff] |
Merge "[DO NOT MERGE] Update Security String to 2018-01-01 Bug: 69257226" into nyc-dev am: 5b0a42789a am: 3fea140429 am: 7a58ff0c94 am: 590dbe143d am: 71b1a4d8ea -s ours am: a80c186e97 am: 38b24d03b5 Change-Id: I7d2228b403f83f71a8be76684c8b2dc751828264