tree 9a57bd12528b8ef4ef5775dbad6cbd353f22e9a4
parent d77e7f2c76d076c19f34e7ccdd8bab75f16e2589
parent 1b09ea6eb522576f089951e29a6f62f0c784fdb3
author Mark Salyzyn <salyzyn@google.com> 1470681372 +0000
committer android-build-merger <android-build-merger@google.com> 1470681372 +0000

Merge "logcatd: logpersist.start more descriptive warning" am: dad158f3a1 am: 1b09ea6eb5
am: dbfe0a1abe

Change-Id: I460f84979b743a341de4265f398b53cea8724e49