| commit | 0feae044f077bd32ba49ef074eacac7d1e704b8f | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Feb 03 00:36:42 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Feb 03 00:36:42 2015 +0000 |
| tree | 4978eb37fadfdce6596030eed829f16b06e09009 | |
| parent | 2e748d0bc320ab50b80a37de78986c2da61eb26a [diff] | |
| parent | 46adfa69b689bc9f9e15c87275839f233a404582 [diff] |
am 46adfa69: Merge "init: Add support "&&" operator in property triggers" * commit '46adfa69b689bc9f9e15c87275839f233a404582': init: Add support "&&" operator in property triggers