commit | 5c947cdf72270fd1f766b2248d526ebc8c7227f6 | [log] [tgz] |
---|---|---|
author | Yi Kong <yikong@google.com> | Thu Jun 07 22:04:12 2018 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jun 07 22:04:12 2018 -0700 |
tree | b380c02ad827172e29a30508043a445a890227c7 | |
parent | fef7d7c61de7c3140c215748946c5acc1b08e04c [diff] | |
parent | 83af600986a41b38213e798bba8ea89ad0523096 [diff] |
[automerger skipped] Merge "Replace NULL/0 with nullptr" am: a160f5a70f am: 83af600986 -s ours Change-Id: I7487cb843f2973f81c9168363451a83f115169f2