am f2e8cb7d: resolved conflicts for merge of d4bdb7df to mnc-dev-plus-aosp

* commit 'f2e8cb7d7dae8be5fdd3b4965697613fd526c299':
  logd: deal with sloppy leading expire messages
diff --git a/rootdir/init.rc b/rootdir/init.rc
index 91725d5..599a08b 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -236,6 +236,7 @@
 
     # Emulated internal storage area
     mkdir /data/media 0770 media_rw media_rw
+
     # Start bootcharting as soon as possible after the data partition is
     # mounted to collect more data.
     mkdir /data/bootchart 0755 shell shell