tree c361b5f5fbdcffffe04477f922bda96087ca1e3f
parent 6b07191d13b4b0779e94118bc4e89be3b6ae973e
parent 2500e3809346fb0fba97b3e83de80a5e22913b9c
author Mark Salyzyn <salyzyn@google.com> 1517888143 +0000
committer android-build-merger <android-build-merger@google.com> 1517888143 +0000

Merge "libcutils: Add "daemon" and "bin" users for testing only" am: 718899b415
am: 2500e38093

Change-Id: Ic4890f5f15b093985c5342983be300a4946ffbd6