OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 275b234 13c5c34)
resolve merge conflicts of 13c5c34 to mnc-dev
authorChristopher Tate <ctate@google.com>
Mon, 5 Dec 2016 22:10:47 +0000 (14:10 -0800)
committerChristopher Tate <ctate@google.com>
Mon, 5 Dec 2016 22:10:47 +0000 (14:10 -0800)
Change-Id: I7f57cde153648f48ff038400aa437b76971d4771

1  2 
libs/binder/Parcel.cpp patch | diff1 | diff2 | blob | history

diff --cc libs/binder/Parcel.cpp
Simple merge
frameworks/native
About OSDN
Find Software
Develop Software
Help