tree f153629119d2599c72f4f6191ef8d7061d7973d9
parent bd900c98ef38d8d6ef0c82a039ecb35fca7030be
parent a1b40f0267c0d24af33b34d578777e27c7c30611
author Mark Salyzyn <salyzyn@google.com> 1468432940 +0000
committer android-build-merger <android-build-merger@google.com> 1468432940 +0000

Merge \"Settings: trampoline persist.logd.logpersistd to logd.logpersistd\"
am: a1b40f0267

Change-Id: I38e4c7756a2ea617053656558d8223458d898a28