Dimitry Ivanov ac8abec905 resolve merge conflicts of bb958f0f5 to oc-dev-plus-aosp ... Test: n/a Change-Id: Iede624aa5210794d48b63d6053293028483b89c7		2017-05-25 09:57:15 -07:00
..
android	Revert "Continue using the legacy NDK android/log.h."	2017-01-30 22:14:59 +00:00
nativebridge	Load vendor public libraries to sphal namespace	2017-05-24 11:02:31 -07:00
private	Moved include/android_filesystem_*.h and canned_fs_config.h to libcutils	2017-03-21 17:34:58 -07:00
ziparchive	ZipWriter: Do not write DataDescriptor for STORED files	2017-04-06 17:03:32 -07:00
backtrace	Moved include/backtrace to libbacktrace/include	2017-04-13 09:26:20 -07:00
cutils	Revert "Revert "Exporting C headers from system/core""	2017-01-25 12:50:29 -08:00
log	Revert "Revert "Exporting C headers from system/core""	2017-01-25 12:50:29 -08:00
system	Moved all files from include/system to libsystem/include/system	2017-04-11 16:13:42 +00:00
sysutils	Exporting C++ headers from system/core	2017-01-24 22:51:36 +00:00
utils	Exporting C++ headers from system/core	2017-01-24 22:51:36 +00:00