Mattias Nissler ecd32c786c resolve merge conflicts of 2bf95ac to nyc-dev-plus-aosp ...

am: 6e2a8b1

* commit '6e2a8b11ecb0bdfd6f4a2f096519075663a2d1c2':
  Convert recovery to use BoringSSL instead of mincrypt.

Change-Id: Ief6b279d1e7fd00af4e8153ac29212343493b293

2016-04-13 01:49:17 +00:00

..

Android.mk

Convert recovery to use BoringSSL instead of mincrypt.

2016-04-06 15:54:17 +02: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

Move selinux dependencies out of header files.

2016-04-01 18:24:39 -07:00

install.h

updater: Add a function to check first block

2016-01-07 11:19:48 -08:00

updater.cpp

Merge "Move selinux dependencies out of header files." am: 8124750 am: dc91161

2016-04-02 16:12:29 +00:00

updater.h

Move selinux dependencies out of header files.

2016-04-01 18:24:39 -07:00