am 0feae044: am 46adfa69: Merge "init: Add support "&&" operator in property triggers"

* commit '0feae044f077bd32ba49ef074eacac7d1e704b8f':
  init: Add support "&&" operator in property triggers
This commit is contained in:
Elliott Hughes 2015-02-03 00:51:36 +00:00 committed by Android Git Automerger
commit 61db8ca809

Diff content is not available