tree a83e3e7594b26dc0c97343dfe431a5f4f7c28b24
parent c78ecbd65ebdda0b5c38d57fd4b680044252b0b8
parent e3faec3e92a3c981e80b6ef2c51f20ea77e3d9ca
author Aaron Holden <aaronholden@google.com> 1510343958 +0000
committer android-build-merger <android-build-merger@google.com> 1510343958 +0000

Merge "Update ManifestGeneratorTest (fix build)" into oreo-cts-dev
am: e3faec3e92

Change-Id: I50fa36eb1d00849080a7388159030df72e972a08