| commit | 23acdd3f1460bc1c040b319940c5e0e8a78f1040 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Sat Apr 21 00:33:54 2012 -0700 |
| committer | Shawn O. Pearce <sop@google.com> | Thu May 24 09:32:15 2012 -0700 |
| tree | 85709c15416db6717cdff2025cc1aacc438c7ce9 | |
| parent | 2644874d9d3e6c16299a01acddf66cd99fd43414 [diff] |
Parse manifest and local_manifest together Combine manifest and local_manifest into a single list of elements before parsing. This will allow elements in the local_manifest to affect elements in the main manifest. Change-Id: I4d34c9260b299a76be2960b07c0c3fe1af35f33c