OSDN Git Service

Merge remote-tracking branch 'github/cm-10.2' into cm-11.0
authorKoushik Dutta <koushd@gmail.com>
Fri, 29 Nov 2013 17:13:46 +0000 (09:13 -0800)
committerKoushik Dutta <koushd@gmail.com>
Fri, 29 Nov 2013 17:13:46 +0000 (09:13 -0800)
commit81a5d88341e2a6d57ff6e2c4856faf5fed1f5a9e
tree031179b60c1a7a356eb8c1f07ec637cd880f1ef8
parented55b0eed5680ece6d5bd0c54ab93b9b5da360b5
parent95b77e36b9111796851bd84602cce991df452e65
Merge remote-tracking branch 'github/cm-10.2' into cm-11.0

Conflicts:
Superuser/jni/su/daemon.c

Change-Id: Ia849b63cf44d8da9e31b1fbe13b54b0b8289e75d
Superuser/jni/su/daemon.c