OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 295f4fd 27cdfc3)
resolve merge conflicts of f79a82d6a to nyc-mr1-dev-plus-aosp
authorJosh Gao <jmgao@google.com>
Wed, 18 Jan 2017 23:43:23 +0000 (23:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 18 Jan 2017 23:43:23 +0000 (23:43 +0000)
am: 27cdfc3e9d

Change-Id: I0219baebce53482f730cfb73ae600be01bbeb224

1  2 
cmds/dumpstate/utils.cpp patch | diff1 | diff2 | blob | history

diff --cc cmds/dumpstate/utils.cpp
Simple merge
frameworks/native
About OSDN
Find Software
Develop Software
Help