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)
commitf25a113f5355141128d1251ad336c29a4e89c673
treea6801bed1f5b1407b309373bdcf2edf25e6e083b
parentfcd192e64fef1951fc8376fd3454d1588c0b398a
parent5f7024d846c062a7745a1af0bd65f1d55fb13706
Merge "s/NULL/nullptr/ in system properties code." am: eb35144e58
am: 5f7024d846

Change-Id: I78324168525b0bd4fb676fa794139abc4806624d