am 57eb040b: (-s ours) am bd5f10ad: am 699be5f6: Merge "init: do expand_props before calling the builtins."

* commit '57eb040ba94a4bd415ff5a71901643332dad493b':
This commit is contained in:
Yabin Cui 2015-08-27 11:45:22 +00:00 committed by Android Git Automerger
commit 0a963c8486

Diff content is not available