tree 8231ba83837532594fb0a7e340662bfcbb79e2d7
parent c72f5a0ed4911e3902ebdcbe764a9eb725d26837
author Paul Lawrence <paullawrence@google.com> 1444255317 -0700
committer Paul Lawrence <paullawrence@google.com> 1445275230 -0700

Move stuff around to allow keymaster to start in time

Change-Id: I5161ce11e89e81060e3380f820af3b1c0092c5d2