tree 9075d2a61928f4f712a69b8981156cacd899b121
parent 5ccfc87db0464f6eb77c64b880cadb5a9cdb6650
parent cfcbb81e6abc7feef43aafc434460659b4d10c10
author Steven Moreland <smoreland@google.com> 1541184172 -0700
committer android-build-merger <android-build-merger@google.com> 1541184172 -0700

Merge "Clarify comment how manifests are combined." am: ee45b5350a
am: cfcbb81e6a

Change-Id: I08c2aaefd577069d3cee394ec309c35dd7b9c611