| commit | 69afefdfcce6ce43aeec149b8874914a90fbc839 | [log] [tgz] |
|---|---|---|
| author | Yabin Cui <yabinc@google.com> | Thu Aug 27 11:45:22 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:45:22 2015 +0000 |
| tree | 8c31250a527d15d67e52f8d8871ae6062178ee22 | |
| parent | cf8e0ab7eb503b2edc47b7ba5ca6ef56a6b7279f [diff] | |
| parent | 48af27774771a28de7ec8a24268f629d1430d0e0 [diff] |
am 57eb040b: (-s ours) am bd5f10ad: am 699be5f6: Merge "init: do expand_props before calling the builtins." * commit '57eb040ba94a4bd415ff5a71901643332dad493b':