OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 748c546 7b2b968)
am 7b2b968d: am 33c3c1bd: Merge "Revert "do not dumpstate raft BUG: 24159112"" into...
authorJason Parks <jparks@google.com>
Mon, 12 Oct 2015 15:45:00 +0000 (15:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 Oct 2015 15:45:00 +0000 (15:45 +0000)
* commit '7b2b968db484118668b70d040464f379a7e9e915':
  Revert "do not dumpstate raft BUG: 24159112"

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

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