tree 883f72e36e42fc007f75bb1f0dfec7abb27e8985
parent ddc296e841fa98bc89c0459d1dd3e438c790f15d
parent 68df4bd08bfb550456cc8edb19fa894a124db38c
author Tom Cherry <tomcherry@google.com> 1441160625 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441160625 +0000

am 68df4bd0: Merge "DO NOT MERGE init: Fix parsing of multiple property triggers" into mnc-dr-dev

* commit '68df4bd08bfb550456cc8edb19fa894a124db38c':
  DO NOT MERGE init: Fix parsing of multiple property triggers