commit 2a576e20975b9a12610d19c3d782045b7fa227b8
author Tao Bao <tbao@google.com> Tue Oct 18 23:00:55 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Oct 18 23:00:55 2016 +0000
tree 4511c43e2ed24d872bc3142374bdbc255bf7fc22
parent 434697f06b7432a2358550eadd74fb97d617035c
parent 69c117c2ffb71cdbfde71c65d510014e162a1016

resolve merge conflicts of e89bf25 to stage-aosp-master
am: 69c117c2ff

Change-Id: I668395a8f8ec5d004755ed39f8b7517be1e3527d

uncrypt/Android.mk

diff --git a/uncrypt/Android.mk b/uncrypt/Android.mk
index 97fc708..59084b0 100644
--- a/uncrypt/Android.mk
+++ b/uncrypt/Android.mk
@@ -20,11 +20,12 @@
 LOCAL_SRC_FILES := uncrypt.cpp
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
 LOCAL_MODULE := uncrypt
-LOCAL_STATIC_LIBRARIES := libbootloader_message \
-                          libbase \
-                          liblog \
-                          libfs_mgr \
-                          libcutils
+LOCAL_STATIC_LIBRARIES := \
+    libbootloader_message \
+    libbase \
+    liblog \
+    libfs_mgr \
+    libcutils
 LOCAL_CFLAGS := -Werror
 LOCAL_INIT_RC := uncrypt.rc