| commit | f1e8dcdea86c7d9eec0040b313f2570979095e2f | [log] [tgz] |
|---|---|---|
| author | Yabin Cui <yabinc@google.com> | Thu Aug 27 14:28:53 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:28:53 2015 +0000 |
| tree | 5672430a9f41c6eb948db44ee1706bd3fb354ba9 | |
| parent | 48cce2f6f0400ad8b243b42b3b65163429764d94 [diff] | |
| parent | 69afefdfcce6ce43aeec149b8874914a90fbc839 [diff] |
am 0a963c84: am 57eb040b: (-s ours) am bd5f10ad: am 699be5f6: Merge "init: do expand_props before calling the builtins." * commit '0a963c848635c5b569997ca3c638cf3f070de2c2':