tree 6fdaaa815d21f1a4dc39d8c10ad40f4bdbfe448b
parent 632e2c30c079119570ed9dc14c59f537f0e14301
parent 124b7cb732eaa9660cd119d4e86f0aed79e30625
author Mark Salyzyn <salyzyn@google.com> 1479398570 +0000
committer android-build-merger <android-build-merger@google.com> 1479398570 +0000

Merge "libcutils: move cutils/files.h to cutils/android_get_control_file.h" am: 8c41e791ed am: 809dee506e am: 26545e3c60
am: 124b7cb732

Change-Id: I575ef1a45746c14b5c01301d8336307f2575a4ba