tree 867b59a7bb457558c600bf64f2bdcbb8ba035088
parent 3df954fbf47d668bfd28d8c73afafe280308dc44
parent 56efe020b74d12456e96db8bd1937e15a97403eb
author Mark Salyzyn <salyzyn@google.com> 1469160577 +0000
committer android-build-merger <android-build-merger@google.com> 1469160577 +0000

Merge changes from topic \'enable_persist_kernel_log\' into nyc-mr1-dev
am: 56efe020b7

Change-Id: I3dceee794572d94af13226f6af0eab0e465d6be8