resolve merge conflicts of e89bf25 to stage-aosp-master

am: 69c117c2ff Change-Id: I668395a8f8ec5d004755ed39f8b7517be1e3527d
2016-10-18 23:00:55 +00:00 · 2016-10-18 23:00:55 +00:00 · 2a576e2097
commit 2a576e2097
parent 434697f06b 69c117c2ff
1 changed files with 6 additions and 5 deletions
--- a/uncrypt/Android.mk
+++ b/uncrypt/Android.mk
@ -20,11 +20,12 @@ LOCAL_CLANG := true
 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