dedf2922d5
Conflicts: libc/SYSCALLS.TXT Change-Id: I5d09be413cf720fbed905f96313b007997ada76c
Conflicts: libc/SYSCALLS.TXT Change-Id: I5d09be413cf720fbed905f96313b007997ada76c