OSDN Git Service

(root) / android-x86 / frameworks-native.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 60f8850 5fef0c6)
resolve merge conflicts of 5fef0c6 to nyc-mr1-dev-plus-aosp
authorCasey Dahlin <sadmac@google.com>
Thu, 1 Dec 2016 02:18:20 +0000 (18:18 -0800)
committerCasey Dahlin <sadmac@google.com>
Thu, 1 Dec 2016 02:18:20 +0000 (18:18 -0800)
commit9b4156210feb4c2347e50cdb8f86ba7af07c734e
treedf006e3016b09ec11c9aa968763bf7d9b5cb2b7atree | snapshot
parent60f8850e70287858fde57ad8ebfef73560f4477ccommit | diff
parent5fef0c6d88a66ab51bcf2219fa481e20bfb842f3commit | diff
resolve merge conflicts of 5fef0c6 to nyc-mr1-dev-plus-aosp

Change-Id: I2362661ac567a1fe73b660499ecfb1a20f27c0db
include/binder/Parcel.h diff1 | diff2 | blob | history
frameworks/native
About OSDN
Find Software
Develop Software
Help