| commit | 61db8ca809ee4bc6c0ab93edf3c959f94ab2e173 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Feb 03 00:51:36 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Feb 03 00:51:36 2015 +0000 |
| tree | 33bc14ce6e84c3df5374d05d1ba363146b2ecb18 | |
| parent | 6efa88c0c62dca31bf3f4f29c89bd39ddc9ff611 [diff] | |
| parent | 0feae044f077bd32ba49ef074eacac7d1e704b8f [diff] |
am 0feae044: am 46adfa69: Merge "init: Add support "&&" operator in property triggers" * commit '0feae044f077bd32ba49ef074eacac7d1e704b8f': init: Add support "&&" operator in property triggers