OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fef7d7c 83af600)
[automerger skipped] Merge "Replace NULL/0 with nullptr" am: a160f5a70f
authorYi Kong <yikong@google.com>
Fri, 8 Jun 2018 05:04:12 +0000 (22:04 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 8 Jun 2018 05:04:12 +0000 (22:04 -0700)
am: 83af600986  -s ours

Change-Id: I7487cb843f2973f81c9168363451a83f115169f2


Trivial merge
frameworks/native
About OSDN
Find Software
Develop Software
Help