OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2f655da 9d68ed0)
am 9d68ed0e: Merge "Add timeout for dump_file."
authorChristopher Ferris <cferris@google.com>
Thu, 26 Feb 2015 18:40:42 +0000 (18:40 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 26 Feb 2015 18:40:42 +0000 (18:40 +0000)
* commit '9d68ed0ecd3a101c13a163cfe730b13b1564b442':
  Add timeout for dump_file.

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