Merge "liblog: fix a memory leak in __android_log_pmsg_file_write()" am: a8629e8e15
am: 161953f49c

Change-Id: I40f2c5f37e681bb6c2df3e985a9f9d6841df9178