OSDN Git Service

Merge "s/NULL/nullptr/ in system properties code." am: eb35144e58
authorElliott Hughes <enh@google.com>
Tue, 31 Jan 2017 18:29:28 +0000 (18:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 31 Jan 2017 18:29:28 +0000 (18:29 +0000)
am: 5f7024d846

Change-Id: I78324168525b0bd4fb676fa794139abc4806624d


Trivial merge