tree 45718b62fcf55c2a82a17544b79c69e02100c70a
parent 51f8aa27fdc5675cf0e621af6e14625a24720ff0
parent 4cc6e2e33f9fae58e0d125adcc51171cdc6da435
author Mark Salyzyn <salyzyn@google.com> 1432829135 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1432829135 +0000

am 4cc6e2e3: Merge "init: expand_props on trigger"

* commit '4cc6e2e33f9fae58e0d125adcc51171cdc6da435':
  init: expand_props on trigger