| commit | bb4986c6cee69e5e53296c0b1c8447e66361a3e7 | [log] [tgz] |
|---|---|---|
| author | Adam Seaton <aseaton@google.com> | Wed Mar 14 22:16:05 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Mar 14 22:16:05 2018 +0000 |
| tree | 0442c2ddc235395399491f02b42c4f7a601b814b | |
| parent | d027dfa39f96fcd7e20966ca1d0db1819d7d37cb [diff] | |
| parent | 3bdafad5b0c0ce22e028e023e84e2fd98f3b1c6f [diff] |
Merge "DO NOT MERGE Updating security string for oc-mr1-dev to 2018-05-05" into oc-mr1-dev am: 3bdafad5b0 -s ours Change-Id: I1cfcb20c43ded9ec84a1343de5ce5bd5992281f6