Elliott Hughes 54937d0b59 resolve merge conflicts of 5cf4701 to nyc-dev-plus-aosp ... am: 20ab2db * commit '20ab2db8f1e04f4f9b4c1dc0e9377f0586bfc10a': Switch to <android-base/unique_fd.h>. Change-Id: I3ad1eae327ad83c82aa684e4a2846d4313fd4486		2016-03-29 18:29:55 +00:00
..
Android.mk	Fix the improper use of LOCAL_WHOLE_STATIC_LIBRARIES.	2016-03-03 14:52:44 -08:00
blockimg.cpp	Switch to <android-base/unique_fd.h>.	2016-03-29 08:18:34 -07:00
blockimg.h	installer for new block OTA system	2014-08-19 16:53:39 -07:00
install.cpp	Control fault injection with config files instead of build flags	2016-03-21 21:37:33 +00:00
install.h	updater: Add a function to check first block	2016-01-07 11:19:48 -08:00
updater.cpp	Control fault injection with config files instead of build flags am: ff6df89	2016-03-21 21:40:15 +00:00
updater.h	installer for new block OTA system	2014-08-19 16:53:39 -07:00