tree 44ed5b9e275d79c7c1df73371ce77cae03b5ed3d
parent e76c5dfc238601ea61a3cd500d4182b4de07c5f3
parent 26545e3c60e5988a75657c0debb1ed71fd5bb39d
author Mark Salyzyn <salyzyn@google.com> 1479397718 +0000
committer android-build-merger <android-build-merger@google.com> 1479397718 +0000

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

Change-Id: I4ab91b2e8d6e104f2d350f6bdaf743f772673bfa