| commit | f1c86e3108e38b6c33a1bce928b51d1c1e9d08aa | [log] [tgz] |
|---|---|---|
| author | Ian Pedowitz <ijpedowitz@google.com> | Thu Sep 03 06:27:18 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 03 06:27:18 2015 +0000 |
| tree | d6f5de7ca4e031b40f2d5f7c007861f11ded21c7 | |
| parent | e418cb113783e1b6af2a82846ff798e96ef5dbbc [diff] | |
| parent | cd4ba20719f8313080ccc80798a2a07181ee0da2 [diff] |
am 72b82fa0: "resolved conflicts for merge of cd7d73fa to mnc-dr-dev-plus-aosp" * commit '72b82fa00dbfe5b3aaf937fda3d8ef272095dbfc': DO NOT MERGE init: Fix parsing of multiple property triggers