tree d74cd0442b6c801fab6e85d7b00b08d4cdc73e73
parent f448bae042b8e1d78b25a593645788f13d8e2211
parent 942daae4ffc177fd732882bf41197685f103cc81
author Mark Salyzyn <salyzyn@google.com> 1479396782 +0000
committer android-build-merger <android-build-merger@google.com> 1479396782 +0000

Merge "libcutils: move cutils/files.h to cutils/android_get_control_file.h"
am: 8c41e791ed

Change-Id: Ifbc00285da734859d590153a7c6cfc8e51c014f9