| commit | 33457e8191fa43b07d1de1bd059c6c9ac9a0966a | [log] [tgz] |
|---|---|---|
| author | Yi Kong <yikong@google.com> | Thu Jun 07 23:21:32 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jun 07 23:21:32 2018 -0700 |
| tree | f2c319da06657cc510b5fabc333189fbe2abac25 | |
| parent | c9bc53a2e15cf71c830edb5b9861c098b137d8c4 [diff] | |
| parent | 5c947cdf72270fd1f766b2248d526ebc8c7227f6 [diff] |
[automerger skipped] Merge "Replace NULL/0 with nullptr" am: a160f5a70f am: 83af600986 -s ours am: 5c947cdf72 -s ours Change-Id: I0d8d1918c66f65f797c8a26d5d59973e413085ee