OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 730cd51 6108f5d)
Resolve merge conflicts of 6108f5d to nyc-mr1-dev
authorFelipe Leme <felipeal@google.com>
Mon, 23 May 2016 21:07:04 +0000 (14:07 -0700)
committerFelipe Leme <felipeal@google.com>
Mon, 23 May 2016 21:07:04 +0000 (14:07 -0700)
BUG: 28867848
Change-Id: I99392f1706af5fb9268ad1b32aa7f4b10e397d84

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

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