OSDN Git Service

Merge remote-tracking branch 'cern/multiuser-regression-v1' into cm-11.0
authorKoushik Dutta <koushd@gmail.com>
Fri, 29 Nov 2013 17:17:57 +0000 (09:17 -0800)
committerKoushik Dutta <koushd@gmail.com>
Fri, 29 Nov 2013 17:17:57 +0000 (09:17 -0800)
commita43f033dc9a1472821e57aab76b67b76263c99c4
tree18e9c4ce06cca0c1158687d4dbec488d4f6215cb
parentefc2142d89aad2aa41d7501550aa2543f1c51f78
parent699e4a96910eaa05f73a07a0dad3760ba822ffda
Merge remote-tracking branch 'cern/multiuser-regression-v1' into cm-11.0

Conflicts:
Superuser/jni/su/su.c

Change-Id: I2474f5048e590592e1baa7f4bb1caf76e1245b74
Superuser/jni/su/su.c