tree 5391235ef778fa443f61551c8b254e5d46be8798
parent a4fd555fc9654ba18d947deb13edae303172d575
parent c5a558907a49dae3db6c40c2032a92841c93b2d6
author Mark Salyzyn <salyzyn@google.com> 1432833576 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1432833576 +0000

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

* commit 'c5a558907a49dae3db6c40c2032a92841c93b2d6':
  init: expand_props on trigger