commit d0c64e2cc7a9c5a8fc7c7e6ea7dd77511004f763
author The Android Automerger <android-build@google.com> Tue Jul 07 01:02:57 2015 -0700
committer The Android Automerger <android-build@google.com> Tue Jul 07 01:02:57 2015 -0700
tree 9d7bdb42a81703b5f571a609551ec0507a5b522a
parent 35ce8fe57112828f2351e71fdc52590788f61d89
parent b65ff42deb8c9afe2a228d7745226af66c884bfa

merge in mnc-release history after reset to mnc-dev

src/devices/tech/filesystem-config.jd

diff --git a/src/devices/tech/filesystem-config.jd b/src/devices/tech/filesystem-config.jd
index 46a2ffc..78017a1 100644
--- a/src/devices/tech/filesystem-config.jd
+++ b/src/devices/tech/filesystem-config.jd
@@ -81,7 +81,7 @@
 index 0000000..874195f
 --- /dev/null
 +++ b/android_filesystem_config.h
-@@ -0,0 +1,36 @@
+@@ -0,0 +1,36 @@
 +/*
 + * Copyright (C) 2015 The Android Open Source Project
 + *
@@ -125,7 +125,7 @@
 index 0c71d21..235c1a7 100644
 --- a/device.mk
 +++ b/device.mk
-@@ -18,7 +18,8 @@ PRODUCT_PACKAGES := \
+@@ -18,7 +18,8 @@ PRODUCT_PACKAGES := \
      libwpa_client \
      hostapd \
      wpa_supplicant \