OSDN Git Service

Merge remote-tracking branch 'tance/terminal-support' into cm-11.0
authorKoushik Dutta <koushd@gmail.com>
Sun, 12 Jan 2014 19:54:13 +0000 (11:54 -0800)
committerKoushik Dutta <koushd@gmail.com>
Sun, 12 Jan 2014 19:54:13 +0000 (11:54 -0800)
commitb31c141651623af3d823b92c53e4347d132da9b9
treea608038539913e48eb58428238bd8623f1a302bd
parent8516028fcf8e6f18625af453411d67324f84af66
parent8881f708fbdc1d0da2f58c1728db548a38b8d61e
Merge remote-tracking branch 'tance/terminal-support' into cm-11.0

Conflicts:
Superuser/jni/su/daemon.c

Change-Id: I2739f6bcbed03636d7a2fb66377977cd16999926
Superuser/jni/Android.mk
Superuser/jni/su/daemon.c