| commit | 7461eb40ede288ea18ee0bffeb7b3c086e68b5d5 | [log] [tgz] |
|---|---|---|
| author | Mark Salyzyn <salyzyn@google.com> | Thu May 28 17:39:20 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 28 17:39:20 2015 +0000 |
| tree | 363be99d00f4d2cafb3b7ea837fd9eb1f7c50ae2 | |
| parent | 7c3f575c8a3e65340dc5d07701c7908ddb9b0907 [diff] | |
| parent | 708db865251b216593e3a943f36e1e676c9644c9 [diff] |
am 708db865: am c5a55890: am 4cc6e2e3: Merge "init: expand_props on trigger" * commit '708db865251b216593e3a943f36e1e676c9644c9': init: expand_props on trigger