| commit | d7e105998ed33dbdebc1235d5463ee044e31c0f2 | [log] [tgz] |
|---|---|---|
| author | Elisa Pascual Trevino <elisapascual@google.com> | Mon Dec 03 15:44:25 2018 -0800 |
| committer | android-build-team Robot <android-build-team-robot@google.com> | Tue Dec 11 19:39:19 2018 +0000 |
| tree | 1495a9c6d55fce9b7c5722a9b64d09b532149b87 | |
| parent | 5536934c0e388c4037005a4f2b0841387d1d09e8 [diff] |
Fix merge conflict in the security string for OC-M8-release (cherry picked from commit 5502a6440a3953890094384d9559be0de1f0809a) Change-Id: I2014aa7c37a9d1347bb289f4ef23173f0be62959