tree 85709c15416db6717cdff2025cc1aacc438c7ce9
parent 2644874d9d3e6c16299a01acddf66cd99fd43414
author Colin Cross <ccross@android.com> 1334993634 -0700
committer Shawn O. Pearce <sop@google.com> 1337877135 -0700

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