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

* commit '0a963c848635c5b569997ca3c638cf3f070de2c2':
This commit is contained in:
Yabin Cui 2015-08-27 14:28:53 +00:00 committed by Android Git Automerger
commit a2fb3f7cac

Diff content is not available