tree d34dd60368c091973d370a7b7bb9f490886f79ab
parent a838fcfa75d7c45d06ac7c8ef5bfc4bac90d6abf
parent 1a17bfa25c3cce3f45c84b58969483668325628b
author Andreas Gampe <agampe@google.com> 1506612350 +0000
committer android-build-merger <android-build-merger@google.com> 1506612350 +0000

Merge "Frameworks: Move Log holder to be preloaded" into oc-mr1-dev
am: 1a17bfa25c

Change-Id: I108472693a5ce73cec529b354e65b1eeed6ee151