| commit | 63f5017f425ce1dfb4aff662eba2b80986bd9ff6 | [log] [tgz] |
|---|---|---|
| author | Adam Seaton <aseaton@google.com> | Fri May 19 19:55:25 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri May 19 19:55:25 2017 +0000 |
| tree | 57bfb75347027b7e07496984e1d72b8dfa9a59f9 | |
| parent | cbdbe2d21ddb44bd147948d0a33b47795f8e9399 [diff] | |
| parent | d5b83851c1e1ea23561a776e44ad8625b95d03ae [diff] |
Merge "[DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695 am: e2d22d501d am: 54f2af92b2 am: ad8ec7f781 -s ours am: bf2d4968da -s ours am: 05965e37e6 am: b3219be744 -s ours am: 025c26de91 am: 5868fb70b3 am: 90028cf69a am: 5482ef4491 -s ours am: fc30cdc480 am: 04b0eb600b am: 9f80f090a8 am: 111b9d5599 am: e5875ba6ec -s ours am: c539c7656d" into oc-dev-plus-aosp am: d5b83851c1 Change-Id: I1236dd799482bb5c21964e4f3d2ef25e47d982e9