tree 2083e73068e7d0ae0a573f0f6b03b7763bb3e4fb
parent d873a33e31a21ba975d078524e2a56f8af9d36c1
parent 451ff596cfb2b79ca9494c67d93b43c99d7500d8
author Mark Salyzyn <salyzyn@google.com> 1517891387 +0000
committer android-build-merger <android-build-merger@google.com> 1517891387 +0000

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

Change-Id: Id2abde064963cbb68929c76ff5a47d4f52995190