OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e81a4f1 953c052)
resolve merge conflicts of 13c5c34 to mnc-dev am: 79b74d787d am: abe293b950 am: 02e44...
authorChristopher Tate <ctate@google.com>
Tue, 6 Dec 2016 00:17:19 +0000 (00:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 6 Dec 2016 00:17:19 +0000 (00:17 +0000)
am: 953c05276e

Change-Id: If6e16f080e701171d7c9b69adbeaab3a6910b63a

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